Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b34cc42a65 | ||
|
|
7b1f0a8737 | ||
|
|
a171e4013b | ||
|
|
3e3561c18f | ||
|
|
0097a97ab0 | ||
|
|
6e583a0c8e | ||
|
|
780b981c68 | ||
|
|
5df933f0e2 | ||
|
|
750a98cb06 | ||
|
|
1ebfa0a715 | ||
|
|
dc82de8ba2 | ||
|
|
9ecdaa30bf | ||
|
|
ee69005318 | ||
|
|
740a6d9b96 | ||
|
|
b1d680468b | ||
|
|
64c18af7b6 | ||
|
|
6728a8a809 | ||
|
|
0cb70b0a04 | ||
|
|
2f7f108cd8 | ||
|
|
c595c654aa | ||
|
|
c0d1cabb12 | ||
|
|
51e81c7bb1 | ||
|
|
6bdaa54ce8 | ||
|
|
65ac2f37f2 | ||
|
|
b08bb90cef | ||
|
|
89e76d369b | ||
|
|
ed8cc47c7a | ||
|
|
d988fdc849 | ||
|
|
a0ff53fb9d | ||
|
|
1d1dd7dc66 | ||
|
|
cb4ef9ffa8 | ||
|
|
459f403541 | ||
|
|
465962b939 | ||
|
|
2fad493eac | ||
|
|
fb8ea8c4f8 | ||
|
|
9713e5a8a4 | ||
|
|
7cee59f548 | ||
|
|
c7e638fc70 | ||
|
|
a4b445cf1f | ||
|
|
6859f6125c | ||
|
|
d85e043325 | ||
|
|
967adaa607 | ||
|
|
e233b0fa09 | ||
|
|
2e52a396d3 | ||
|
|
93731be764 | ||
|
|
8a5d826fd3 | ||
|
|
d5fa0ff8e8 | ||
|
|
823b00930e | ||
|
|
da449f2a9e | ||
|
|
8835ee4ed2 | ||
|
|
3ef9dbec1f | ||
|
|
b2a78d6dd2 | ||
|
|
1aaba348d2 | ||
|
|
4d5c4e6223 | ||
|
|
d08739839e | ||
|
|
e891696387 | ||
|
|
08cb78f065 | ||
|
|
819a4d8bb3 | ||
|
|
aa5696e586 | ||
|
|
3c9232949a | ||
|
|
a43ad2b737 | ||
|
|
7e5e8fd2c1 | ||
|
|
7fc2530693 | ||
|
|
e104df51b0 | ||
|
|
6d237cc337 | ||
|
|
a982ac8c38 | ||
|
|
8494976e4f | ||
|
|
7b2ad249da | ||
|
|
5f73bee3c5 | ||
|
|
709f918272 | ||
|
|
dca9854486 | ||
|
|
d93dce88d8 | ||
|
|
5ae0f29f42 | ||
|
|
eae4a3ac09 | ||
|
|
5e1ae7ac0f | ||
|
|
2422588db5 | ||
|
|
0a1707f1d0 | ||
|
|
c6d6128c5e | ||
|
|
8f2072d2af | ||
|
|
42fbcfb26a | ||
|
|
a9568d388f | ||
|
|
36ea0fecc6 | ||
|
|
6a26bbdf84 | ||
|
|
45deefdea3 | ||
|
|
476c5f2077 | ||
|
|
aaddfb186b | ||
|
|
5407bf9922 | ||
|
|
8aea3e43aa |
No files matched your search
@@ -71,9 +71,9 @@ body:
|
||||
attributes:
|
||||
label: Additional Server Info
|
||||
description: |
|
||||
Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins?
|
||||
Do you use a proxy (eg. Velocity)? What software do you use and what plugins?
|
||||
placeholder: |
|
||||
Example: "I also use BungeeCord with the following plugins: x, y, z"
|
||||
Example: "I also use Velocity with the following plugins: x, y, z"
|
||||
validations:
|
||||
required: false
|
||||
|
||||
@@ -82,7 +82,7 @@ body:
|
||||
label: Checklist
|
||||
description: Make sure you have followed each of the steps outlined here.
|
||||
options:
|
||||
- label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. BungeeCord), **not on both**.
|
||||
- label: Via plugins are only running on **EITHER** the backend servers (e.g. Paper) **OR** the proxy (e.g. Velocity), **not on both**.
|
||||
required: true
|
||||
- label: I have included a ViaVersion dump.
|
||||
required: true
|
||||
|
||||
@@ -1,22 +1,27 @@
|
||||
# ViaRewind
|
||||
[](https://github.com/ViaVersion/ViaRewind/releases)
|
||||
[](https://github.com/ViaVersion/ViaRewind/actions)
|
||||
[](https://viaversion.com/discord)
|
||||
|
||||
**ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.** <br>
|
||||
**ViaBackwards addon to allow 1.8.x and 1.7.x clients on newer server versions.** <br>
|
||||
Runs on 1.9-latest servers or 1.8 clients and lower.
|
||||
|
||||
**You can override the included version in [ViaFabric](https://modrinth.com/mod/viafabric) or [ViaProxy](https://github.com/ViaVersion/ViaProxy):**
|
||||
- in **ViaFabric**, put ViaRewind into the `mods` folder
|
||||
- in **ViaProxy**, put ViaRewind into the `jars` folder
|
||||
|
||||
**Depending on the platform and version, this also requires [ViaVersion](https://modrinth.com/mod/viaversion) and [ViaBackwards](https://modrinth.com/mod/viabackwards).**
|
||||
Note: when using ViaFabric <= 1.16.5 or J8 ViaProxy builds, you need [J8 ViaRewind](https://ci.viaversion.com/view/ViaRewind/job/ViaRewind-Java8/) builds.
|
||||
|
||||
Support Status
|
||||
-
|
||||
While ViaRewind will keep getting updates to function with changes to ViaVersion or ViaBackwards, it will likely not receive many bug fixes or additional features anymore.
|
||||
**Requires [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion) and [ViaBackwards](https://hangar.papermc.io/ViaVersion/ViaBackwards) to be installed..**
|
||||
|
||||
Releases / Dev Builds
|
||||
Releases/Dev Builds
|
||||
-
|
||||
You can find releases in the following places:
|
||||
|
||||
- **Hangar (for our plugins)**: https://hangar.papermc.io/ViaVersion/ViaRewind
|
||||
- **Modrinth (for our mods)**: https://modrinth.com/mod/viarewind
|
||||
- **GitHub**: https://github.com/ViaVersion/ViaRewind/releases
|
||||
|
||||
Dev builds for **all** of our projects are on our Jenkins server:
|
||||
|
||||
- **Jenkins**: https://ci.viaversion.com/view/ViaRewind/
|
||||
@@ -27,4 +32,15 @@ Other Links
|
||||
|
||||
**Issue tracker:** https://github.com/ViaVersion/ViaRewind/issues
|
||||
|
||||
**List of contributors:** https://github.com/ViaVersion/ViaRewind/graphs/contributors
|
||||
**List of contributors:** https://github.com/ViaVersion/ViaRewind/graphs/contributors
|
||||
|
||||
Building
|
||||
-
|
||||
After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
|
||||
of the `universal/build/libs` directory.
|
||||
|
||||
You need JDK 17 or newer to build ViaRewind.
|
||||
|
||||
License
|
||||
-
|
||||
This project is licensed under the [GNU General Public License Version 3](LICENSE).
|
||||
File renamed without changes.
+4
-10
@@ -4,31 +4,24 @@ plugins {
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven {
|
||||
url = uri("https://repo.viaversion.com")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://repo.maven.apache.org/maven2/")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://maven.fabricmc.net/")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://repo.spongepowered.org/repository/maven-public/")
|
||||
}
|
||||
|
||||
maven {
|
||||
url = uri("https://nexus.velocitypowered.com/repository/maven-public/")
|
||||
}
|
||||
@@ -36,6 +29,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
compileOnly "com.viaversion:viaversion:${project.viaversion_version}"
|
||||
compileOnly "com.viaversion:viabackwards:${project.viabackwards_version}"
|
||||
compileOnly "io.netty:netty-all:${project.netty_version}"
|
||||
compileOnly "com.google.guava:guava:${project.guava_version}"
|
||||
}
|
||||
@@ -44,15 +38,15 @@ base {
|
||||
archivesName = project.maven_name
|
||||
group = project.maven_group
|
||||
version = project.maven_version
|
||||
description = "ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions."
|
||||
description = "ViaBackwards addon to allow 1.8.x and 1.7.x clients on newer server versions."
|
||||
}
|
||||
|
||||
java.sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
java.sourceCompatibility = JavaVersion.VERSION_17
|
||||
|
||||
tasks {
|
||||
// Variable replacements
|
||||
processResources {
|
||||
for (final def file in ["plugin.yml", "bungee.yml", "META-INF/sponge_plugins.json", "fabric.mod.json"]) {
|
||||
for (final def file in ["plugin.yml", "fabric.mod.json"]) {
|
||||
filesMatching(file) {
|
||||
expand(
|
||||
"version": project.version,
|
||||
@@ -15,7 +15,6 @@
|
||||
* 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 com.viaversion.viarewind;
|
||||
|
||||
import com.viaversion.viarewind.api.ViaRewindPlatform;
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
name: ViaRewind
|
||||
main: com.viaversion.viarewind.BukkitPlugin
|
||||
authors: [Gerrygames, FlorianMichael/EnZaXD, creeper123321123]
|
||||
authors: [FlorianMichael/EnZaXD, Gerrygames, creeper123321123]
|
||||
version: ${version}
|
||||
description: ${description}
|
||||
website: https://viaversion.com/rewind
|
||||
api-version: 1.13
|
||||
folia-supported: true
|
||||
load: STARTUP
|
||||
depend: [ViaVersion]
|
||||
softdepend: [ViaBackwards]
|
||||
depend: [ViaVersion, ViaBackwards]
|
||||
@@ -1,9 +0,0 @@
|
||||
plugins {
|
||||
id "com.viaversion.java-conventions"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(":viarewind-common")
|
||||
|
||||
compileOnly(annotationProcessor("net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT"))
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
maven_name=viarewind-bungee
|
||||
@@ -1,7 +0,0 @@
|
||||
name: ViaRewind
|
||||
main: com.viaversion.viarewind.BungeePlugin
|
||||
authors: [Gerrygames, FlorianMichael/EnZaXD, creeper123321123]
|
||||
version: ${version}
|
||||
depends: [ViaVersion]
|
||||
softdepends: [ViaBackwards]
|
||||
website: https://viaversion.com/rewind
|
||||
+1
-1
@@ -13,7 +13,7 @@ sourceSets {
|
||||
main {
|
||||
classTokenReplacer {
|
||||
property("\${version}", rootProject.maven_version)
|
||||
property("\${impl_version}", "git-${project.name}-${rootProject.maven_version}:${project.latestCommitHash()}")
|
||||
property("\${impl_version}", "git-ViaRewind-${rootProject.maven_version}:${project.latestCommitHash()}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
* 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 com.viaversion.viarewind;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
@@ -15,57 +15,102 @@
|
||||
* 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 com.viaversion.viarewind;
|
||||
|
||||
import com.viaversion.viaversion.util.Config;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class ViaRewindConfig extends Config implements com.viaversion.viarewind.api.ViaRewindConfig {
|
||||
|
||||
public ViaRewindConfig(File configFile) {
|
||||
super(configFile);
|
||||
reload();
|
||||
private CooldownIndicator cooldownIndicator;
|
||||
private boolean replaceAdventureMode;
|
||||
private boolean replaceParticles;
|
||||
private int maxBookPages;
|
||||
private int maxBookPageSize;
|
||||
private boolean emulateWorldBorder;
|
||||
private boolean alwaysShowOriginalMobName;
|
||||
private String worldBorderParticle;
|
||||
private boolean enableOffhand;
|
||||
private String offhandCommand;
|
||||
|
||||
public ViaRewindConfig(File configFile, Logger logger) {
|
||||
super(configFile, logger);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void reload() {
|
||||
super.reload();
|
||||
loadFields();
|
||||
}
|
||||
|
||||
private void loadFields() {
|
||||
cooldownIndicator = CooldownIndicator.valueOf(getString("cooldown-indicator", "TITLE").toUpperCase());
|
||||
replaceAdventureMode = getBoolean("replace-adventure", false);
|
||||
replaceParticles = getBoolean("replace-particles", false);
|
||||
maxBookPages = getInt("max-book-pages", 100);
|
||||
maxBookPageSize = getInt("max-book-page-length", 5000);
|
||||
emulateWorldBorder = getBoolean("emulate-world-border", true);
|
||||
alwaysShowOriginalMobName = getBoolean("always-show-original-mob-name", true);
|
||||
worldBorderParticle = getString("world-border-particle", "fireworksSpark");
|
||||
enableOffhand = getBoolean("enable-offhand", true);
|
||||
offhandCommand = getString("offhand-command", "/offhand");
|
||||
}
|
||||
|
||||
@Override
|
||||
public CooldownIndicator getCooldownIndicator() {
|
||||
return CooldownIndicator.valueOf(getString("cooldown-indicator", "TITLE").toUpperCase());
|
||||
return cooldownIndicator;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isReplaceAdventureMode() {
|
||||
return getBoolean("replace-adventure", false);
|
||||
return replaceAdventureMode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isReplaceParticles() {
|
||||
return getBoolean("replace-particles", false);
|
||||
return replaceParticles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxBookPages() {
|
||||
return getInt("max-book-pages", 100);
|
||||
return maxBookPages;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxBookPageSize() {
|
||||
return getInt("max-book-page-length", 5000);
|
||||
return maxBookPageSize;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmulateWorldBorder() {
|
||||
return getBoolean("emulate-world-border", true);
|
||||
return emulateWorldBorder;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean alwaysShowOriginalMobName() {
|
||||
return alwaysShowOriginalMobName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getWorldBorderParticle() {
|
||||
return getString("world-border-particle", "fireworksSpark");
|
||||
return worldBorderParticle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnableOffhand() {
|
||||
return enableOffhand;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getOffhandCommand() {
|
||||
return offhandCommand;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -74,8 +119,12 @@ public class ViaRewindConfig extends Config implements com.viaversion.viarewind.
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void handleConfig(Map<String, Object> map) {
|
||||
public InputStream getDefaultConfigInputStream() {
|
||||
return getClass().getClassLoader().getResourceAsStream("assets/viarewind/config.yml");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void handleConfig(Map<String, Object> map) {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
* 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 com.viaversion.viarewind.api;
|
||||
|
||||
import com.viaversion.viaversion.api.configuration.Config;
|
||||
@@ -77,10 +76,31 @@ public interface ViaRewindConfig extends Config {
|
||||
*/
|
||||
boolean isEmulateWorldBorder();
|
||||
|
||||
/**
|
||||
* Always shows the original mob's name instead of only when hovering over them with the cursor.
|
||||
*
|
||||
* @return true if enabled
|
||||
*/
|
||||
boolean alwaysShowOriginalMobName();
|
||||
|
||||
/**
|
||||
* The particle to show the world border for the 1.8+ world border for 1.7.x clients
|
||||
*
|
||||
* @return the particle name (see <a href="https://wiki.vg/index.php?title=Protocol&oldid=7368#Particle_2">Particle registry for Packet</a>)
|
||||
*/
|
||||
String getWorldBorderParticle();
|
||||
|
||||
/**
|
||||
* If enabled, 1.8 players on 1.9+ servers can use /offhand to switch items between their main hand and offhand.
|
||||
*
|
||||
* @return true if enabled
|
||||
*/
|
||||
boolean isEnableOffhand();
|
||||
|
||||
/**
|
||||
* Allows to define the offhand command
|
||||
*
|
||||
* @return the offhand command
|
||||
*/
|
||||
String getOffhandCommand();
|
||||
}
|
||||
@@ -15,14 +15,13 @@
|
||||
* 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 com.viaversion.viarewind.api;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.ViaRewindConfig;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.Protocol1_7_2_5To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.Protocol1_7_6_10To1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.protocol.ProtocolManager;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
@@ -42,7 +41,7 @@ public interface ViaRewindPlatform {
|
||||
* Initialize ViaRewind
|
||||
*/
|
||||
default void init(final File configFile) {
|
||||
ViaRewindConfig config = new ViaRewindConfig(configFile);
|
||||
ViaRewindConfig config = new ViaRewindConfig(configFile, getLogger());
|
||||
config.reload();
|
||||
Via.getManager().getConfigurationProvider().register(config);
|
||||
|
||||
@@ -50,11 +49,12 @@ public interface ViaRewindPlatform {
|
||||
|
||||
Via.getManager().getSubPlatforms().add(IMPL_VERSION);
|
||||
|
||||
getLogger().info("Registering protocols...");
|
||||
final ProtocolManager protocolManager = Via.getManager().getProtocolManager();
|
||||
protocolManager.registerProtocol(new Protocol1_7_6_10To1_7_2_5(), ProtocolVersion.v1_7_2, ProtocolVersion.v1_7_6);
|
||||
protocolManager.registerProtocol(new Protocol1_8To1_7_6_10(), ProtocolVersion.v1_7_6, ProtocolVersion.v1_8);
|
||||
|
||||
protocolManager.registerProtocol(new Protocol1_7_2_5To1_7_6_10(), ProtocolVersion.v1_7_1, ProtocolVersion.v1_7_6);
|
||||
protocolManager.registerProtocol(new Protocol1_7_6_10To1_8(), ProtocolVersion.v1_7_6, ProtocolVersion.v1_8);
|
||||
protocolManager.registerProtocol(new Protocol1_8To1_9(), ProtocolVersion.v1_8, ProtocolVersion.v1_9);
|
||||
protocolManager.registerProtocol(new Protocol1_9To1_8(), ProtocolVersion.v1_8, ProtocolVersion.v1_9);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+18
-16
@@ -15,25 +15,27 @@
|
||||
* 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 com.viaversion.viarewind.api.data;
|
||||
|
||||
package com.viaversion.viarewind.utils;
|
||||
import com.viaversion.viabackwards.api.data.BackwardsMappingData;
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.nbt.tag.CompoundTag;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class Enchantments {
|
||||
public final static Map<Short, String> ENCHANTMENTS = new HashMap<>();
|
||||
public class RewindMappingData extends BackwardsMappingData {
|
||||
|
||||
static {
|
||||
ENCHANTMENTS.put((short) 1, "I");
|
||||
ENCHANTMENTS.put((short) 2, "II");
|
||||
ENCHANTMENTS.put((short) 3, "III");
|
||||
ENCHANTMENTS.put((short) 4, "IV");
|
||||
ENCHANTMENTS.put((short) 5, "V");
|
||||
ENCHANTMENTS.put((short) 6, "VI");
|
||||
ENCHANTMENTS.put((short) 7, "VII");
|
||||
ENCHANTMENTS.put((short) 8, "VIII");
|
||||
ENCHANTMENTS.put((short) 9, "IX");
|
||||
ENCHANTMENTS.put((short) 10, "X");
|
||||
public RewindMappingData(String unmappedVersion, String mappedVersion) {
|
||||
super(unmappedVersion, mappedVersion);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Logger getLogger() {
|
||||
return ViaRewind.getPlatform().getLogger();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected CompoundTag readMappingsFile(String name) {
|
||||
return RewindMappingDataLoader.INSTANCE.loadNBTFromDir(name);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.data;
|
||||
|
||||
import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class RewindMappingDataLoader extends BackwardsMappingDataLoader {
|
||||
|
||||
public static final RewindMappingDataLoader INSTANCE = new RewindMappingDataLoader();
|
||||
|
||||
public RewindMappingDataLoader() {
|
||||
super(RewindMappingDataLoader.class, "assets/viarewind/data/");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Logger getLogger() {
|
||||
return ViaRewind.getPlatform().getLogger();
|
||||
}
|
||||
|
||||
@Override
|
||||
public File getDataFolder() {
|
||||
return ViaRewind.getPlatform().getDataFolder();
|
||||
}
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.minecraft;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.Protocol;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Represents a model that is replacing an entity on the client side (e.g. armor stand)
|
||||
*/
|
||||
public abstract class EntityModel<T extends Protocol<?, ?, ?, ?>> {
|
||||
|
||||
protected final UserConnection user;
|
||||
protected final T protocol;
|
||||
|
||||
public EntityModel(final UserConnection user, final T protocol) {
|
||||
this.user = user;
|
||||
this.protocol = protocol;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The entity id of the entity this model is replacing
|
||||
*/
|
||||
public abstract int getEntityId();
|
||||
|
||||
/**
|
||||
* Updates the position of the entity this model is replacing
|
||||
*
|
||||
* @param x The new x position
|
||||
* @param y The new y position
|
||||
* @param z The new z position
|
||||
*/
|
||||
public abstract void updateReplacementPosition(final double x, final double y, final double z);
|
||||
|
||||
/**
|
||||
* Handles the original movement packet of the entity this model is replacing
|
||||
*
|
||||
* @param x The x position
|
||||
* @param y The y position
|
||||
* @param z The z position
|
||||
*/
|
||||
public abstract void handleOriginalMovementPacket(final double x, final double y, final double z);
|
||||
|
||||
/**
|
||||
* Sets the yaw and pitch of the entity this model is replacing
|
||||
*
|
||||
* @param yaw The new yaw
|
||||
* @param pitch The new pitch
|
||||
*/
|
||||
public abstract void setYawPitch(final float yaw, final float pitch);
|
||||
|
||||
/**
|
||||
* Sets the head yaw of the entity this model is replacing
|
||||
*
|
||||
* @param yaw The new head yaw
|
||||
*/
|
||||
public abstract void setHeadYaw(final float yaw);
|
||||
|
||||
/**
|
||||
* Spawns the entity this model is replacing
|
||||
*/
|
||||
public abstract void sendSpawnPacket();
|
||||
|
||||
/**
|
||||
* Destroys the entity this model is replacing
|
||||
*/
|
||||
public abstract void deleteEntity();
|
||||
|
||||
/**
|
||||
* Updates the metadata of the entity this model is replacing
|
||||
*
|
||||
* @param metadataList The new metadata
|
||||
*/
|
||||
public abstract void updateMetadata(final List<Metadata> metadataList);
|
||||
|
||||
public UserConnection getUser() {
|
||||
return user;
|
||||
}
|
||||
|
||||
public T getProtocol() {
|
||||
return protocol;
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,6 @@
|
||||
* 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 com.viaversion.viarewind.api.minecraft;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
|
||||
|
||||
+14
-16
@@ -15,33 +15,31 @@
|
||||
* 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 com.viaversion.viarewind.api.minecraft.entitydata;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.VoidType;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
|
||||
public enum MetaType1_7_6_10 implements MetaType {
|
||||
Byte(0, Type.BYTE),
|
||||
Short(1, Type.SHORT),
|
||||
Int(2, Type.INT),
|
||||
Float(3, Type.FLOAT),
|
||||
String(4, Type.STRING),
|
||||
Slot(5, Types1_7_6_10.COMPRESSED_NBT_ITEM),
|
||||
Position(6, Type.VECTOR),
|
||||
NonExistent(-1, new VoidType());
|
||||
public enum EntityDataTypes1_7_6_10 implements EntityDataType {
|
||||
BYTE(0, Types.BYTE),
|
||||
SHORT(1, Types.SHORT),
|
||||
INT(2, Types.INT),
|
||||
FLOAT(3, Types.FLOAT),
|
||||
STRING(4, Types.STRING),
|
||||
ITEM(5, RewindTypes.COMPRESSED_NBT_ITEM),
|
||||
POSITION(6, Types.VECTOR);
|
||||
|
||||
private final int typeID;
|
||||
private final Type<?> type;
|
||||
|
||||
MetaType1_7_6_10(int typeID, Type<?> type) {
|
||||
EntityDataTypes1_7_6_10(int typeID, Type<?> type) {
|
||||
this.typeID = typeID;
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public static MetaType1_7_6_10 byId(int id) {
|
||||
public static EntityDataTypes1_7_6_10 byId(int id) {
|
||||
return values()[id];
|
||||
}
|
||||
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.utils.math;
|
||||
package com.viaversion.viarewind.api.minecraft.math;
|
||||
|
||||
public class AABB {
|
||||
Vector3d min;
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.utils.math;
|
||||
package com.viaversion.viarewind.api.minecraft.math;
|
||||
|
||||
public class Ray3d {
|
||||
Vector3d start;
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.utils.math;
|
||||
package com.viaversion.viarewind.api.minecraft.math;
|
||||
|
||||
public class RayTracing {
|
||||
|
||||
+5
-4
@@ -15,17 +15,18 @@
|
||||
* 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 com.viaversion.viarewind.api.minecraft.math;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_8to1_9.util;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
|
||||
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
|
||||
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.EntityTracker1_9;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.Vector;
|
||||
|
||||
@Deprecated // ?????????
|
||||
public class RelativeMoveUtil {
|
||||
|
||||
public static Vector[] calculateRelativeMoves(UserConnection user, int entityId, int relX, int relY, int relZ) {
|
||||
EntityTracker tracker = user.get(EntityTracker.class);
|
||||
EntityTracker1_9 tracker = user.getEntityTracker(Protocol1_9To1_8.class);
|
||||
|
||||
int x;
|
||||
int y;
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.utils.math;
|
||||
package com.viaversion.viarewind.api.minecraft.math;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.api.netty;
|
||||
package com.viaversion.viarewind.api.minecraft.netty;
|
||||
|
||||
import io.netty.channel.ChannelHandler;
|
||||
import io.netty.channel.ChannelHandlerAdapter;
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.api.netty;
|
||||
package com.viaversion.viarewind.api.minecraft.netty;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
@@ -1,106 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.rewriter;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
|
||||
public class Replacement {
|
||||
private final int id;
|
||||
private final int data;
|
||||
private final String name;
|
||||
|
||||
private String resetName;
|
||||
private String bracketName;
|
||||
|
||||
public Replacement(final int id) {
|
||||
this(id, -1);
|
||||
}
|
||||
|
||||
public Replacement(final int id, final int data) {
|
||||
this(id, data, null);
|
||||
}
|
||||
|
||||
public Replacement(final int id, final String name) {
|
||||
this(id, -1, name);
|
||||
}
|
||||
|
||||
public Replacement(final int id, final int data, final String name) {
|
||||
this.id = id;
|
||||
this.data = data;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void buildNames(final String protocolVersion) {
|
||||
if (this.name != null) {
|
||||
this.resetName = ChatColorUtil.translateAlternateColorCodes("&r" + protocolVersion + " " + this.name);
|
||||
this.bracketName = ChatColorUtil.translateAlternateColorCodes(" &r&7(" + protocolVersion + " " + this.name + "&r&7)");
|
||||
}
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public int getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param item The item to replace
|
||||
* @return The replacement for the item or the item if not found
|
||||
*/
|
||||
public Item replace(final Item item) {
|
||||
item.setIdentifier(id); // Set the new id
|
||||
if (data != -1) {
|
||||
item.setData((short) data); // Set the new data
|
||||
}
|
||||
if (name != null) { // Set the new name
|
||||
CompoundTag rootTag = item.tag() == null ? new CompoundTag() : item.tag(); // Get root tag or create new one if not exists
|
||||
|
||||
if (!rootTag.contains("display")) rootTag.put("display", new CompoundTag()); // Create display tag if not exists
|
||||
|
||||
final CompoundTag display = rootTag.get("display");
|
||||
if (display.contains("Name")) {
|
||||
final StringTag name = display.get("Name");
|
||||
if (!name.getValue().equals(resetName) && !name.getValue().endsWith(bracketName)) {
|
||||
name.setValue(name.getValue() + bracketName); // Append the new name tag
|
||||
}
|
||||
} else {
|
||||
display.put("Name", new StringTag(resetName)); // Set the new name tag
|
||||
}
|
||||
item.setTag(rootTag);
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param data The data of the item/block
|
||||
* @return The replacement data for the item/block
|
||||
*/
|
||||
public int replaceData(int data) {
|
||||
return this.data == -1 ? data : this.data;
|
||||
}
|
||||
}
|
||||
-116
@@ -1,116 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.rewriter;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.data.entity.ClientEntityIdChangeListener;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.util.Pair;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public abstract class ReplacementEntityTracker extends StoredObject implements ClientEntityIdChangeListener {
|
||||
private final Map<EntityType, Pair<EntityType, String>> ENTITY_REPLACEMENTS = new HashMap<>();
|
||||
|
||||
private final Map<Integer, EntityType> entityMap = new HashMap<>();
|
||||
private final Map<Integer, EntityType> entityReplacementMap = new HashMap<>();
|
||||
|
||||
private int playerId = -1;
|
||||
|
||||
private final ProtocolVersion version;
|
||||
|
||||
private final int displayNameVisibilityIndex;
|
||||
private final MetaType displayNameVisibilityType;
|
||||
private final int displayNameIndex;
|
||||
private final MetaType displayNameType;
|
||||
|
||||
public ReplacementEntityTracker(UserConnection user, ProtocolVersion version, MetaType displayNameVisibilityType, MetaType displayNameType) {
|
||||
this(user, version, 3, displayNameVisibilityType, 2, displayNameType);
|
||||
}
|
||||
|
||||
public ReplacementEntityTracker(UserConnection user, ProtocolVersion version, int displayNameVisibilityIndex, MetaType displayNameVisibilityType, int displayNameIndex, MetaType displayNameType) {
|
||||
super(user);
|
||||
this.version = version;
|
||||
this.displayNameVisibilityIndex = displayNameVisibilityIndex;
|
||||
this.displayNameVisibilityType = displayNameVisibilityType;
|
||||
this.displayNameIndex = displayNameIndex;
|
||||
this.displayNameType = displayNameType;
|
||||
}
|
||||
|
||||
public void registerEntity(final EntityType oldType, final EntityType newType, final String name) {
|
||||
ENTITY_REPLACEMENTS.put(oldType, new Pair<>(newType, this.version.getName() + " " + name));
|
||||
}
|
||||
|
||||
public void addEntity(final int entityId, final EntityTypes1_10.EntityType type) {
|
||||
entityMap.put(entityId, type);
|
||||
}
|
||||
|
||||
public int replaceEntity(final int entityId, final EntityTypes1_10.EntityType type) {
|
||||
entityReplacementMap.put(entityId, type);
|
||||
|
||||
return ENTITY_REPLACEMENTS.get(type).key().getId();
|
||||
}
|
||||
|
||||
public void removeEntity(final int entityId) {
|
||||
entityMap.remove(entityId);
|
||||
entityReplacementMap.remove(entityId);
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
entityMap.clear();
|
||||
entityReplacementMap.clear();
|
||||
}
|
||||
|
||||
public boolean isReplaced(final EntityTypes1_10.EntityType type) {
|
||||
return ENTITY_REPLACEMENTS.containsKey(type);
|
||||
}
|
||||
|
||||
public void updateMetadata(final int entityId, final List<Metadata> metadata) throws Exception {
|
||||
final String name = ENTITY_REPLACEMENTS.get(entityMap.get(entityId)).value();
|
||||
metadata.add(new Metadata(this.displayNameVisibilityIndex, this.displayNameVisibilityType, (byte) 1));
|
||||
metadata.add(new Metadata(this.displayNameIndex, this.displayNameType, name));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientEntityId(int entityId) {
|
||||
removeEntity(this.playerId);
|
||||
addEntity(entityId, EntityTypes1_10.EntityType.ENTITY_HUMAN);
|
||||
|
||||
this.playerId = entityId;
|
||||
}
|
||||
|
||||
public Map<Integer, EntityType> getEntityMap() {
|
||||
return entityMap;
|
||||
}
|
||||
|
||||
public Map<Integer, EntityType> getEntityReplacementMap() {
|
||||
return entityReplacementMap;
|
||||
}
|
||||
|
||||
public int getPlayerId() {
|
||||
return playerId;
|
||||
}
|
||||
}
|
||||
-115
@@ -1,115 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.api.minecraft.IdDataCombine;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.api.rewriter.ItemRewriter;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
|
||||
public abstract class ReplacementItemRewriter<T extends AbstractProtocol<?, ?, ?, ?>> implements ItemRewriter<T> {
|
||||
private final Int2ObjectMap<Replacement> ITEM_REPLACEMENTS = new Int2ObjectOpenHashMap<>();
|
||||
private final Int2ObjectMap<Replacement> BLOCK_REPLACEMENTS = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
private final T protocol;
|
||||
private final ProtocolVersion protocolVersion;
|
||||
|
||||
public ReplacementItemRewriter(final T protocol, final ProtocolVersion protocolVersion) {
|
||||
this.protocol = protocol;
|
||||
this.protocolVersion = protocolVersion;
|
||||
}
|
||||
|
||||
public void registerItem(int id, Replacement replacement) {
|
||||
registerItem(id, -1, replacement);
|
||||
}
|
||||
|
||||
public void registerBlock(int id, Replacement replacement) {
|
||||
registerBlock(id, -1, replacement);
|
||||
}
|
||||
|
||||
public void registerItemBlock(int id, Replacement replacement) {
|
||||
registerItemBlock(id, -1, replacement);
|
||||
}
|
||||
|
||||
public void registerItem(int id, int data, Replacement replacement) {
|
||||
ITEM_REPLACEMENTS.put(generateTrackingId(id, data), replacement);
|
||||
replacement.buildNames(protocolVersion.getName());
|
||||
}
|
||||
|
||||
public void registerBlock(int id, int data, Replacement replacement) {
|
||||
BLOCK_REPLACEMENTS.put(generateTrackingId(id, data), replacement);
|
||||
replacement.buildNames(protocolVersion.getName());
|
||||
}
|
||||
|
||||
public void registerItemBlock(int id, int data, Replacement replacement) {
|
||||
registerItem(id, data, replacement);
|
||||
registerBlock(id, data, replacement);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param item The item to replace
|
||||
* @return The replacement for the item or the item if not found
|
||||
*/
|
||||
public Item replace(Item item) {
|
||||
Replacement replacement = ITEM_REPLACEMENTS.get(generateTrackingId(item.identifier(), item.data()));
|
||||
if (replacement == null) replacement = ITEM_REPLACEMENTS.get(generateTrackingId(item.identifier(), -1));
|
||||
|
||||
return replacement == null ? item : replacement.replace(item);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param id The id of the item/block
|
||||
* @param data The data of the item/block
|
||||
* @return The replacement for the item/block or null if not found
|
||||
*/
|
||||
public Replacement replace(int id, int data) {
|
||||
Replacement replacement = BLOCK_REPLACEMENTS.get(generateTrackingId(id, data));
|
||||
if (replacement == null) replacement = BLOCK_REPLACEMENTS.get(generateTrackingId(id, -1));
|
||||
|
||||
return replacement;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param combined The combined id and data
|
||||
* @return The generated tracking id for the item/block
|
||||
*/
|
||||
public int replace(int combined) {
|
||||
final int data = IdDataCombine.dataFromCombined(combined);
|
||||
final Replacement replace = replace(IdDataCombine.idFromCombined(combined), data);
|
||||
|
||||
return replace != null ? IdDataCombine.toCombined(replace.getId(), replace.replaceData(data)) : combined;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param id The id of the item/block
|
||||
* @param data The data of the item/block
|
||||
* @return The generated tracking id for the item/block
|
||||
*/
|
||||
private int generateTrackingId(int id, int data) {
|
||||
return (id << 16) | (data & 0xFFFF);
|
||||
}
|
||||
|
||||
@Override
|
||||
public T protocol() {
|
||||
return this.protocol;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.rewriter;
|
||||
|
||||
import com.viaversion.viabackwards.api.BackwardsProtocol;
|
||||
import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter;
|
||||
import com.viaversion.viarewind.api.data.RewindMappingDataLoader;
|
||||
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
|
||||
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
|
||||
import com.viaversion.viaversion.libs.gson.JsonObject;
|
||||
|
||||
public class VRBlockItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType, T extends BackwardsProtocol<C, ?, ?, S>> extends LegacyBlockItemRewriter<C, S, T> {
|
||||
|
||||
protected VRBlockItemRewriter(T protocol, String name) {
|
||||
super(protocol, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JsonObject readMappingsFile(String name) {
|
||||
return RewindMappingDataLoader.INSTANCE.loadFromDataDir(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String nbtTagName() {
|
||||
return "VR|" + protocol.getClass().getSimpleName();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.rewriter;
|
||||
|
||||
import com.viaversion.viabackwards.api.BackwardsProtocol;
|
||||
import com.viaversion.viabackwards.api.rewriters.LegacyEntityRewriter;
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
|
||||
|
||||
public abstract class VREntityRewriter<C extends ClientboundPacketType, T extends BackwardsProtocol<C, ?, ?, ?>> extends LegacyEntityRewriter<C, T> {
|
||||
|
||||
public VREntityRewriter(T protocol) {
|
||||
super(protocol, EntityDataTypes1_8.STRING, EntityDataTypes1_8.BYTE);
|
||||
}
|
||||
|
||||
public VREntityRewriter(T protocol, EntityDataType displayType, EntityDataType displayVisibilityType) {
|
||||
super(protocol, displayType, displayVisibilityType);
|
||||
}
|
||||
|
||||
protected void registerJoinGame1_8(final C packetType) {
|
||||
protocol.registerClientbound(packetType, new PacketHandlers() {
|
||||
@Override
|
||||
protected void register() {
|
||||
map(Types.INT); // Entity id
|
||||
map(Types.UNSIGNED_BYTE); // Game mode
|
||||
map(Types.BYTE); // Dimension
|
||||
handler(playerTrackerHandler());
|
||||
handler(wrapper -> wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Types.BYTE, 0)));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
protected void untrackEntities(final UserConnection connection, final int[] entities) {
|
||||
final EntityTrackerBase tracker = tracker(connection);
|
||||
for (int entityId : entities) {
|
||||
tracker.removeEntity(entityId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object getDisplayVisibilityMetaValue() {
|
||||
return (byte) 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean alwaysShowOriginalMobName() {
|
||||
return ViaRewind.getConfig().alwaysShowOriginalMobName();
|
||||
}
|
||||
}
|
||||
+5
-6
@@ -15,20 +15,19 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.primitive;
|
||||
package com.viaversion.viarewind.api.type;
|
||||
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class ByteIntArrayType extends Type<int[]> {
|
||||
public class IntArrayType extends Type<int[]> {
|
||||
|
||||
public ByteIntArrayType() {
|
||||
public IntArrayType() {
|
||||
super(int[].class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] read(ByteBuf byteBuf) throws Exception {
|
||||
public int[] read(ByteBuf byteBuf) {
|
||||
byte size = byteBuf.readByte();
|
||||
int[] array = new int[size];
|
||||
for (byte i = 0; i < size; i++) {
|
||||
@@ -38,7 +37,7 @@ public class ByteIntArrayType extends Type<int[]> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf byteBuf, int[] array) throws Exception {
|
||||
public void write(ByteBuf byteBuf, int[] array) {
|
||||
byteBuf.writeByte(array.length);
|
||||
for (int i : array) byteBuf.writeInt(i);
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.type;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.BlockPosition;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.function.IntFunction;
|
||||
|
||||
public class PositionVarYType<T extends Number> extends Type<BlockPosition> {
|
||||
|
||||
private final Type<T> yType;
|
||||
private final IntFunction<T> toY;
|
||||
|
||||
public PositionVarYType(final Type<T> yType, final IntFunction<T> toY) {
|
||||
super(BlockPosition.class);
|
||||
|
||||
this.yType = yType;
|
||||
this.toY = toY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPosition read(ByteBuf buffer) {
|
||||
final int x = buffer.readInt();
|
||||
final int y = yType.read(buffer).intValue();
|
||||
final int z = buffer.readInt();
|
||||
|
||||
return new BlockPosition(x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, BlockPosition value) {
|
||||
buffer.writeInt(value.x());
|
||||
yType.write(buffer, this.toY.apply(value.y()));
|
||||
buffer.writeInt(value.z());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.type;
|
||||
|
||||
import com.viaversion.viarewind.api.type.item.NBTType;
|
||||
import com.viaversion.viarewind.api.type.item.ItemArrayType;
|
||||
import com.viaversion.viarewind.api.type.item.ItemType;
|
||||
import com.viaversion.viarewind.api.type.entitydata.EntityDataListType;
|
||||
import com.viaversion.viarewind.api.type.entitydata.EntityDataType;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockPosition;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.nbt.tag.CompoundTag;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Safe to use before protocol loading
|
||||
*/
|
||||
public class RewindTypes {
|
||||
|
||||
public static final Type<int[]> INT_ARRAY = new IntArrayType(); // Integer array with byte as length indicator
|
||||
|
||||
public static final Type<BlockPosition> SHORT_POSITION = new PositionVarYType<>(Types.SHORT, value -> (short) value);
|
||||
public static final Type<BlockPosition> INT_POSITION = new PositionVarYType<>(Types.INT, value -> value);
|
||||
public static final Type<BlockPosition> BYTE_POSITION = new PositionVarYType<>(Types.BYTE, value -> (byte) value);
|
||||
public static final Type<BlockPosition> U_BYTE_POSITION = new PositionVarYType<>(Types.UNSIGNED_BYTE, value -> (short) value);
|
||||
|
||||
public static final Type<CompoundTag> COMPRESSED_NBT = new NBTType();
|
||||
public static final Type<Item> COMPRESSED_NBT_ITEM = new ItemType();
|
||||
public static final Type<Item[]> COMPRESSED_NBT_ITEM_ARRAY = new ItemArrayType();
|
||||
|
||||
}
|
||||
+28
-6
@@ -1,4 +1,21 @@
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.chunk;
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.type.chunk;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
|
||||
@@ -11,19 +28,19 @@ import java.util.zip.Deflater;
|
||||
|
||||
public class BulkChunkType1_7_6 extends Type<Chunk[]> {
|
||||
|
||||
public final static BulkChunkType1_7_6 TYPE = new BulkChunkType1_7_6();
|
||||
public static final BulkChunkType1_7_6 TYPE = new BulkChunkType1_7_6();
|
||||
|
||||
public BulkChunkType1_7_6() {
|
||||
super(Chunk[].class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Chunk[] read(ByteBuf byteBuf) throws Exception {
|
||||
public Chunk[] read(ByteBuf byteBuf) {
|
||||
throw new UnsupportedOperationException(); // Not needed, see https://github.com/ViaVersion/ViaLegacy/blob/main/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/ChunkBulk1_7_6Type.java
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf byteBuf, Chunk[] chunks) throws Exception {
|
||||
public void write(ByteBuf byteBuf, Chunk[] chunks) {
|
||||
final int chunkCount = chunks.length;
|
||||
final ByteArrayOutputStream output = new ByteArrayOutputStream();
|
||||
final int[] chunkX = new int[chunkCount];
|
||||
@@ -33,8 +50,13 @@ public class BulkChunkType1_7_6 extends Type<Chunk[]> {
|
||||
|
||||
for (int i = 0; i < chunkCount; i++) {
|
||||
final Chunk chunk = chunks[i];
|
||||
final Pair<byte[], Short> chunkData = ChunkType1_7_6.serialize(chunk);
|
||||
output.write(chunkData.key());
|
||||
Pair<byte[], Short> chunkData;
|
||||
try {
|
||||
chunkData = ChunkType1_7_6.serialize(chunk);
|
||||
output.write(chunkData.key());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Unable to serialize chunk", e);
|
||||
}
|
||||
chunkX[i] = chunk.getX();
|
||||
chunkZ[i] = chunk.getZ();
|
||||
primaryBitMask[i] = (short) chunk.getBitmask();
|
||||
+10
-6
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.chunk;
|
||||
package com.viaversion.viarewind.api.type.chunk;
|
||||
|
||||
import com.viaversion.viarewind.api.minecraft.ExtendedBlockStorage;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.*;
|
||||
@@ -30,20 +29,25 @@ import java.util.zip.Deflater;
|
||||
|
||||
public class ChunkType1_7_6 extends Type<Chunk> {
|
||||
|
||||
public final static ChunkType1_7_6 TYPE = new ChunkType1_7_6();
|
||||
public static final ChunkType1_7_6 TYPE = new ChunkType1_7_6();
|
||||
|
||||
public ChunkType1_7_6() {
|
||||
super(Chunk.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Chunk read(ByteBuf byteBuf) throws Exception {
|
||||
public Chunk read(ByteBuf byteBuf) {
|
||||
throw new UnsupportedOperationException(); // Not needed, see https://github.com/ViaVersion/ViaLegacy/blob/main/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/Chunk1_7_6Type.java
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf output, Chunk chunk) throws Exception {
|
||||
final Pair<byte[], Short> chunkData = serialize(chunk);
|
||||
public void write(ByteBuf output, Chunk chunk) {
|
||||
Pair<byte[], Short> chunkData;
|
||||
try {
|
||||
chunkData = serialize(chunk);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Unable to serialize chunk", e);
|
||||
}
|
||||
final byte[] data = chunkData.key();
|
||||
final short additionalBitMask = chunkData.value();
|
||||
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.api.type.entitydata;
|
||||
|
||||
import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.entitydata.EntityDataListTypeTemplate;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class EntityDataListType extends EntityDataListTypeTemplate {
|
||||
|
||||
private final Type<EntityData> type;
|
||||
|
||||
public EntityDataListType(Type<EntityData> type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<EntityData> read(ByteBuf buffer) {
|
||||
ArrayList<EntityData> entityData = new ArrayList<>();
|
||||
|
||||
EntityData data;
|
||||
do {
|
||||
data = type.read(buffer);
|
||||
if (data != null) {
|
||||
entityData.add(data);
|
||||
}
|
||||
} while (data != null);
|
||||
|
||||
return entityData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, List<EntityData> entityData) {
|
||||
for (EntityData meta : entityData) {
|
||||
type.write(buffer, meta);
|
||||
}
|
||||
if (entityData.isEmpty()) {
|
||||
type.write(buffer, new EntityData(0, EntityDataTypes1_7_6_10.BYTE, (byte) 0));
|
||||
}
|
||||
buffer.writeByte(127);
|
||||
}
|
||||
}
|
||||
+11
-11
@@ -15,31 +15,31 @@
|
||||
* 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 com.viaversion.viarewind.api.type.entitydata;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.type.types.metadata.MetaTypeTemplate;
|
||||
import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.type.types.entitydata.EntityDataTypeTemplate;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class MetadataType extends MetaTypeTemplate {
|
||||
public class EntityDataType extends EntityDataTypeTemplate {
|
||||
@Override
|
||||
public Metadata read(ByteBuf buffer) throws Exception {
|
||||
public EntityData read(ByteBuf buffer) {
|
||||
byte item = buffer.readByte();
|
||||
if (item == 127) {
|
||||
return null;
|
||||
} else {
|
||||
int typeID = (item & 224) >> 5;
|
||||
MetaType1_7_6_10 type = MetaType1_7_6_10.byId(typeID);
|
||||
EntityDataTypes1_7_6_10 type = EntityDataTypes1_7_6_10.byId(typeID);
|
||||
int id = item & 31;
|
||||
return new Metadata(id, type, type.type().read(buffer));
|
||||
return new EntityData(id, type, type.type().read(buffer));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, Metadata meta) throws Exception {
|
||||
int item = (meta.metaType().typeId() << 5 | meta.id() & 31) & 255;
|
||||
public void write(ByteBuf buffer, EntityData meta) {
|
||||
int item = (meta.dataType().typeId() << 5 | meta.id() & 31) & 255;
|
||||
buffer.writeByte(item);
|
||||
meta.metaType().type().write(buffer, meta.getValue());
|
||||
meta.dataType().type().write(buffer, meta.getValue());
|
||||
}
|
||||
}
|
||||
+9
-9
@@ -15,12 +15,12 @@
|
||||
* 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 com.viaversion.viarewind.api.type.item;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class ItemArrayType extends Type<Item[]> {
|
||||
@@ -30,21 +30,21 @@ public class ItemArrayType extends Type<Item[]> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item[] read(ByteBuf buffer) throws Exception {
|
||||
int amount = Type.SHORT.readPrimitive(buffer);
|
||||
public Item[] read(ByteBuf buffer) {
|
||||
int amount = Types.SHORT.readPrimitive(buffer);
|
||||
Item[] items = new Item[amount];
|
||||
|
||||
for (int i = 0; i < amount; ++i) {
|
||||
items[i] = Types1_7_6_10.COMPRESSED_NBT_ITEM.read(buffer);
|
||||
items[i] = RewindTypes.COMPRESSED_NBT_ITEM.read(buffer);
|
||||
}
|
||||
return items;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, Item[] items) throws Exception {
|
||||
Type.SHORT.writePrimitive(buffer, (short) items.length);
|
||||
public void write(ByteBuf buffer, Item[] items) {
|
||||
Types.SHORT.writePrimitive(buffer, (short) items.length);
|
||||
for (Item item : items) {
|
||||
Types1_7_6_10.COMPRESSED_NBT_ITEM.write(buffer, item);
|
||||
RewindTypes.COMPRESSED_NBT_ITEM.write(buffer, item);
|
||||
}
|
||||
}
|
||||
}
|
||||
+6
-7
@@ -15,10 +15,9 @@
|
||||
* 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 com.viaversion.viarewind.api.type.item;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viaversion.api.minecraft.item.DataItem;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
@@ -31,7 +30,7 @@ public class ItemType extends Type<Item> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item read(ByteBuf buffer) throws Exception {
|
||||
public Item read(ByteBuf buffer) {
|
||||
short id = buffer.readShort();
|
||||
if (id < 0) {
|
||||
return null;
|
||||
@@ -40,19 +39,19 @@ public class ItemType extends Type<Item> {
|
||||
item.setIdentifier(id);
|
||||
item.setAmount(buffer.readByte());
|
||||
item.setData(buffer.readShort());
|
||||
item.setTag(Types1_7_6_10.COMPRESSED_NBT.read(buffer));
|
||||
item.setTag(RewindTypes.COMPRESSED_NBT.read(buffer));
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, Item item) throws Exception {
|
||||
public void write(ByteBuf buffer, Item item) {
|
||||
if (item == null) {
|
||||
buffer.writeShort(-1);
|
||||
} else {
|
||||
buffer.writeShort(item.identifier());
|
||||
buffer.writeByte(item.amount());
|
||||
buffer.writeShort(item.data());
|
||||
Types1_7_6_10.COMPRESSED_NBT.write(buffer, item.tag());
|
||||
RewindTypes.COMPRESSED_NBT.write(buffer, item.tag());
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-6
@@ -15,12 +15,11 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item;
|
||||
package com.viaversion.viarewind.api.type.item;
|
||||
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.io.NBTIO;
|
||||
import com.viaversion.nbt.tag.CompoundTag;
|
||||
import com.viaversion.nbt.io.NBTIO;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufInputStream;
|
||||
import io.netty.buffer.ByteBufOutputStream;
|
||||
@@ -35,7 +34,7 @@ public class NBTType extends Type<CompoundTag> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag read(ByteBuf buffer) throws IOException {
|
||||
public CompoundTag read(ByteBuf buffer) {
|
||||
short length = buffer.readShort();
|
||||
if (length <= 0) {
|
||||
return null;
|
||||
@@ -45,11 +44,13 @@ public class NBTType extends Type<CompoundTag> {
|
||||
|
||||
try (GZIPInputStream gzipStream = new GZIPInputStream(new ByteBufInputStream(compressed))) {
|
||||
return NBTIO.reader(CompoundTag.class).named().read(gzipStream);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, CompoundTag nbt) throws Exception {
|
||||
public void write(ByteBuf buffer, CompoundTag nbt) {
|
||||
if (nbt == null) {
|
||||
buffer.writeShort(-1);
|
||||
return;
|
||||
@@ -59,6 +60,8 @@ public class NBTType extends Type<CompoundTag> {
|
||||
try {
|
||||
try (GZIPOutputStream gzipStream = new GZIPOutputStream(new ByteBufOutputStream(compressedBuf))) {
|
||||
NBTIO.writer().named().write(gzipStream, nbt);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
buffer.writeShort(compressedBuf.readableBytes());
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.viaversion.viarewind.api.type.version;
|
||||
|
||||
import com.viaversion.viarewind.api.type.entitydata.EntityDataListType;
|
||||
import com.viaversion.viarewind.api.type.entitydata.EntityDataType;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Types1_7_6_10 {
|
||||
|
||||
public static final Type<EntityData> ENTITY_DATA = new EntityDataType();
|
||||
public static final Type<List<EntityData>> ENTITY_DATA_LIST = new EntityDataListType(ENTITY_DATA);
|
||||
|
||||
}
|
||||
-99
@@ -1,99 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
|
||||
|
||||
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
|
||||
|
||||
public enum ClientboundPackets1_7_2_5 implements ClientboundPacketType {
|
||||
KEEP_ALIVE, // 0x00
|
||||
JOIN_GAME, // 0x01
|
||||
CHAT_MESSAGE, // 0x02
|
||||
TIME_UPDATE, // 0x03
|
||||
ENTITY_EQUIPMENT, // 0x04
|
||||
SPAWN_POSITION, // 0x05
|
||||
UPDATE_HEALTH, // 0x06
|
||||
RESPAWN, // 0x07
|
||||
PLAYER_POSITION, // 0x08
|
||||
HELD_ITEM_CHANGE, // 0x09
|
||||
USE_BED, // 0x0A
|
||||
ENTITY_ANIMATION, // 0x0B
|
||||
SPAWN_PLAYER, // 0x0C
|
||||
COLLECT_ITEM, // 0x0D
|
||||
SPAWN_ENTITY, // 0x0E
|
||||
SPAWN_MOB, // 0x0F
|
||||
SPAWN_PAINTING, // 0x10
|
||||
SPAWN_EXPERIENCE_ORB, // 0x11
|
||||
ENTITY_VELOCITY, // 0x12
|
||||
DESTROY_ENTITIES, // 0x13
|
||||
ENTITY_MOVEMENT, // 0x14
|
||||
ENTITY_POSITION, // 0x15
|
||||
ENTITY_ROTATION, // 0x16
|
||||
ENTITY_POSITION_AND_ROTATION, // 0x17
|
||||
ENTITY_TELEPORT, // 0x18
|
||||
ENTITY_HEAD_LOOK, // 0x19
|
||||
ENTITY_STATUS, // 0x1A
|
||||
ATTACH_ENTITY, // 0x1B
|
||||
ENTITY_METADATA, // 0x1C
|
||||
ENTITY_EFFECT, // 0x1D
|
||||
REMOVE_ENTITY_EFFECT, // 0x1E
|
||||
SET_EXPERIENCE, // 0x1F
|
||||
ENTITY_PROPERTIES, // 0x20
|
||||
CHUNK_DATA, // 0x21
|
||||
MULTI_BLOCK_CHANGE, // 0x22
|
||||
BLOCK_CHANGE, // 0x23
|
||||
BLOCK_ACTION, // 0x24
|
||||
BLOCK_BREAK_ANIMATION, // 0x25
|
||||
MAP_BULK_CHUNK, // 0x26
|
||||
EXPLOSION, // 0x27
|
||||
EFFECT, // 0x28
|
||||
NAMED_SOUND, // 0x29
|
||||
SPAWN_PARTICLE, // 0x2A
|
||||
GAME_EVENT, // 0x2B
|
||||
SPAWN_GLOBAL_ENTITY, // 0x2C
|
||||
OPEN_WINDOW, // 0x2D
|
||||
CLOSE_WINDOW, // 0x2E
|
||||
SET_SLOT, // 0x2F
|
||||
WINDOW_ITEMS, // 0x30
|
||||
WINDOW_PROPERTY, // 0x31
|
||||
WINDOW_CONFIRMATION, // 0x32
|
||||
UPDATE_SIGN, // 0x33
|
||||
MAP_DATA, // 0x34
|
||||
BLOCK_ENTITY_DATA, // 0x35
|
||||
OPEN_SIGN_EDITOR, // 0x36
|
||||
STATISTICS, // 0x37
|
||||
PLAYER_INFO, // 0x38
|
||||
PLAYER_ABILITIES, // 0x39
|
||||
TAB_COMPLETE, // 0x3A
|
||||
SCOREBOARD_OBJECTIVE, // 0x3B
|
||||
UPDATE_SCORE, // 0x3C
|
||||
DISPLAY_SCOREBOARD, // 0x3D
|
||||
TEAMS, // 0x3E
|
||||
PLUGIN_MESSAGE, // 0x3F
|
||||
DISCONNECT; // 0x40
|
||||
|
||||
@Override
|
||||
public int getId() {
|
||||
return ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name();
|
||||
}
|
||||
}
|
||||
-114
@@ -1,114 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.packet.State;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class Protocol1_7_2_5To1_7_6_10 extends AbstractProtocol<ClientboundPackets1_7_2_5, ClientboundPackets1_7_2_5, ServerboundPackets1_7_2_5, ServerboundPackets1_7_2_5> {
|
||||
public final static ValueTransformer<String, String> REMOVE_DASHES = new ValueTransformer<String, String>(Type.STRING) {
|
||||
@Override
|
||||
public String transform(PacketWrapper packetWrapper, String s) {
|
||||
return s.replace("-", "");
|
||||
}
|
||||
};
|
||||
|
||||
public Protocol1_7_2_5To1_7_6_10() {
|
||||
super(ClientboundPackets1_7_2_5.class, ClientboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING, REMOVE_DASHES); // uuid
|
||||
map(Type.STRING); // name
|
||||
}
|
||||
});
|
||||
|
||||
this.registerClientbound(ClientboundPackets1_7_2_5.SPAWN_PLAYER, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.STRING, REMOVE_DASHES); // uuid
|
||||
map(Type.STRING); // name
|
||||
handler(packetWrapper -> { // delete data introduced in 1.7.6
|
||||
final int size = packetWrapper.read(Type.VAR_INT); // data count
|
||||
for (int i = 0; i < size; i++) {
|
||||
packetWrapper.read(Type.STRING); // data name
|
||||
packetWrapper.read(Type.STRING); // data value
|
||||
packetWrapper.read(Type.STRING); // data signature
|
||||
}
|
||||
});
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
map(Type.SHORT); // item in hand
|
||||
map(Types1_7_6_10.METADATA_LIST); // metadata
|
||||
}
|
||||
});
|
||||
|
||||
this.registerClientbound(ClientboundPackets1_7_2_5.TEAMS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING); // team name
|
||||
map(Type.BYTE); // mode
|
||||
handler(packetWrapper -> {
|
||||
byte mode = packetWrapper.get(Type.BYTE, 0);
|
||||
if (mode == 0 || mode == 2) { // team is created or information is updated
|
||||
packetWrapper.passthrough(Type.STRING); // team display name
|
||||
packetWrapper.passthrough(Type.STRING); // team prefix
|
||||
packetWrapper.passthrough(Type.STRING); // team suffix
|
||||
packetWrapper.passthrough(Type.BYTE); // friendly fire
|
||||
}
|
||||
if (mode == 0 || mode == 3 || mode == 4) { // team is created, player is added or player is removed
|
||||
List<String> entryList = new ArrayList<>();
|
||||
final int size = packetWrapper.read(Type.SHORT);
|
||||
for (int i = 0; i < size; i++) {
|
||||
entryList.add(packetWrapper.read(Type.STRING));
|
||||
}
|
||||
|
||||
entryList = entryList.stream()
|
||||
.map(it -> it.length() > 16 ? it.substring(0, 16) : it) // trim to 16 characters
|
||||
.distinct() // remove duplicates
|
||||
.collect(Collectors.toList());
|
||||
|
||||
packetWrapper.write(Type.SHORT, (short) entryList.size());
|
||||
for (String entry : entryList) {
|
||||
packetWrapper.write(Type.STRING, entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-186
@@ -1,186 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
|
||||
import com.viaversion.viaversion.util.Pair;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Optional;
|
||||
|
||||
public enum MetaIndex1_7_6_10To1_8 {
|
||||
|
||||
ENTITY_FLAGS(EntityTypes1_10.EntityType.ENTITY, 0, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ENTITY_AIR(EntityTypes1_10.EntityType.ENTITY, 1, MetaType1_7_6_10.Short, MetaType1_8.Short),
|
||||
ENTITY_NAME_TAG(EntityTypes1_10.EntityType.ENTITY, -1, MetaType1_7_6_10.NonExistent, 2, MetaType1_8.String),
|
||||
ENTITY_NAME_TAG_VISIBILITY(EntityTypes1_10.EntityType.ENTITY, -1, MetaType1_7_6_10.NonExistent, 3, MetaType1_8.Byte),
|
||||
ENTITY_SILENT(EntityTypes1_10.EntityType.ENTITY, -1, MetaType1_7_6_10.NonExistent, 4, MetaType1_8.Byte),
|
||||
ENTITY_LIVING_HEALTH(EntityTypes1_10.EntityType.ENTITY_LIVING, 6, MetaType1_7_6_10.Float, MetaType1_8.Float),
|
||||
ENTITY_LIVING_POTION_EFFECT_COLOR(EntityTypes1_10.EntityType.ENTITY_LIVING, 7, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
ENTITY_LIVING_IS_POTION_EFFECT_AMBIENT(EntityTypes1_10.EntityType.ENTITY_LIVING, 8, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ENTITY_LIVING_ARROWS(EntityTypes1_10.EntityType.ENTITY_LIVING, 9, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ENTITY_LIVING_NAME_TAG(EntityTypes1_10.EntityType.ENTITY_LIVING, 10, MetaType1_7_6_10.String, 2, MetaType1_8.String),
|
||||
ENTITY_LIVING_NAME_TAG_VISIBILITY(EntityTypes1_10.EntityType.ENTITY_LIVING, 11, MetaType1_7_6_10.Byte, 3, MetaType1_8.Byte),
|
||||
ENTITY_LIVING_AI(EntityTypes1_10.EntityType.ENTITY_LIVING, -1, MetaType1_7_6_10.NonExistent, 15, MetaType1_8.Byte),
|
||||
ENTITY_AGEABLE_AGE(EntityTypes1_10.EntityType.ENTITY_AGEABLE, 12, MetaType1_7_6_10.Int, MetaType1_8.Byte),
|
||||
ARMOR_STAND_FLAGS(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 10, MetaType1_8.Byte),
|
||||
ARMOR_STAND_HEAD_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 11, MetaType1_8.Rotation),
|
||||
ARMOR_STAND_BODY_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 12, MetaType1_8.Rotation),
|
||||
ARMOR_STAND_LEFT_ARM_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 13, MetaType1_8.Rotation),
|
||||
ARMOR_STAND_RIGHT_ARM_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 14, MetaType1_8.Rotation),
|
||||
ARMOR_STAND_LEFT_LEG_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 15, MetaType1_8.Rotation),
|
||||
ARMOR_STAND_RIGHT_LEG_POSITION(EntityTypes1_10.EntityType.ARMOR_STAND, -1, MetaType1_7_6_10.NonExistent, 16, MetaType1_8.Rotation),
|
||||
HUMAN_SKIN_FLAGS(EntityTypes1_10.EntityType.ENTITY_HUMAN, 16, MetaType1_7_6_10.Byte, 10, MetaType1_8.Byte),
|
||||
HUMAN_UNUSED(EntityTypes1_10.EntityType.ENTITY_HUMAN, -1, MetaType1_7_6_10.NonExistent, 16, MetaType1_8.Byte),
|
||||
HUMAN_ABSORPTION_HEATS(EntityTypes1_10.EntityType.ENTITY_HUMAN, 17, MetaType1_7_6_10.Float, MetaType1_8.Float),
|
||||
HUMAN_SCORE(EntityTypes1_10.EntityType.ENTITY_HUMAN, 18, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
HORSE_FLAGS(EntityTypes1_10.EntityType.HORSE, 16, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
HORSE_TYPE(EntityTypes1_10.EntityType.HORSE, 19, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
HORSE_COLOR(EntityTypes1_10.EntityType.HORSE, 20, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
HORSE_OWNER(EntityTypes1_10.EntityType.HORSE, 21, MetaType1_7_6_10.String, MetaType1_8.String),
|
||||
HORSE_ARMOR(EntityTypes1_10.EntityType.HORSE, 22, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
BAT_HANGING(EntityTypes1_10.EntityType.BAT, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
TAMEABLE_FLAGS(EntityTypes1_10.EntityType.ENTITY_TAMEABLE_ANIMAL, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
TAMEABLE_OWNER(EntityTypes1_10.EntityType.ENTITY_TAMEABLE_ANIMAL, 17, MetaType1_7_6_10.String, MetaType1_8.String),
|
||||
OCELOT_TYPE(EntityTypes1_10.EntityType.OCELOT, 18, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
WOLF_FLAGS(EntityTypes1_10.EntityType.WOLF, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
WOLF_HEALTH(EntityTypes1_10.EntityType.WOLF, 18, MetaType1_7_6_10.Float, MetaType1_8.Float),
|
||||
WOLF_BEGGING(EntityTypes1_10.EntityType.WOLF, 19, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
WOLF_COLLAR_COLOR(EntityTypes1_10.EntityType.WOLF, 20, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
PIG_SADDLE(EntityTypes1_10.EntityType.PIG, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
SHEEP_COLOR_OR_SHEARED(EntityTypes1_10.EntityType.SHEEP, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
VILLAGER_TYPE(EntityTypes1_10.EntityType.VILLAGER, 16, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
ENDERMAN_CARRIED_BLOCK(EntityTypes1_10.EntityType.ENDERMAN, 16, MetaType1_7_6_10.NonExistent, MetaType1_8.Short),
|
||||
ENDERMAN_CARRIED_BLOCK_DATA(EntityTypes1_10.EntityType.ENDERMAN, 17, MetaType1_7_6_10.NonExistent, MetaType1_8.Byte),
|
||||
ENDERMAN_IS_SCREAMING(EntityTypes1_10.EntityType.ENDERMAN, 18, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ZOMBIE_CHILD(EntityTypes1_10.EntityType.ZOMBIE, 12, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ZOMBIE_VILLAGER(EntityTypes1_10.EntityType.ZOMBIE, 13, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ZOMBIE_CONVERTING(EntityTypes1_10.EntityType.ZOMBIE, 14, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
BLAZE_ON_FIRE(EntityTypes1_10.EntityType.BLAZE, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
SPIDER_CLIMBING(EntityTypes1_10.EntityType.SPIDER, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
CREEPER_STATE(EntityTypes1_10.EntityType.CREEPER, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
CREEPER_POWERED(EntityTypes1_10.EntityType.CREEPER, 17, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
CREEPER_IGNITED(EntityTypes1_10.EntityType.CREEPER, 18, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
GHAST_STATE(EntityTypes1_10.EntityType.GHAST, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
GHAST_IS_POWERED(EntityTypes1_10.EntityType.GHAST, 17, MetaType1_7_6_10.NonExistent, MetaType1_8.Byte),
|
||||
SLIME_SIZE(EntityTypes1_10.EntityType.SLIME, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
SKELETON_TYPE(EntityTypes1_10.EntityType.SKELETON, 13, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
WITCH_AGGRESSIVE(EntityTypes1_10.EntityType.WITCH, 21, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
IRON_GOLEM_IS_PLAYER_CREATED(EntityTypes1_10.EntityType.IRON_GOLEM, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
WITHER_WATCHED_TARGET_1(EntityTypes1_10.EntityType.WITHER, 17, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
WITHER_WATCHED_TARGET_2(EntityTypes1_10.EntityType.WITHER, 18, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
WITHER_WATCHED_TARGET_3(EntityTypes1_10.EntityType.WITHER, 19, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
WITHER_INVULNERABLE_TIME(EntityTypes1_10.EntityType.WITHER, 20, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
GUARDIAN_FLAGS(EntityTypes1_10.EntityType.GUARDIAN, 16, MetaType1_7_6_10.NonExistent, MetaType1_8.Byte),
|
||||
GUARDIAN_TARGET(EntityTypes1_10.EntityType.GUARDIAN, 17, MetaType1_7_6_10.NonExistent, MetaType1_8.Int),
|
||||
BOAT_TIME_SINCE_HIT(EntityTypes1_10.EntityType.BOAT, 17, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
BOAT_FORWARD_DIRECTION(EntityTypes1_10.EntityType.BOAT, 18, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
BOAT_DAMAGE_TAKEN(EntityTypes1_10.EntityType.BOAT, 19, MetaType1_7_6_10.Float, MetaType1_8.Float),
|
||||
MINECART_SHAKING_POWER(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 17, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
MINECART_SHAKING_DIRECTION(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 18, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
MINECART_DAMAGE_TAKEN(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 19, MetaType1_7_6_10.Float, MetaType1_8.Float),
|
||||
MINECART_BLOCK_INSIDE(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 20, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
MINECART_BLOCK_Y(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 21, MetaType1_7_6_10.Int, MetaType1_8.Int),
|
||||
MINECART_SHOW_BLOCK(EntityTypes1_10.EntityType.MINECART_ABSTRACT, 22, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
FURNACE_MINECART_IS_POWERED(EntityTypes1_10.EntityType.MINECART_FURNACE, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
ITEM_ITEM(EntityTypes1_10.EntityType.DROPPED_ITEM, 10, MetaType1_7_6_10.Slot, MetaType1_8.Slot),
|
||||
ARROW_IS_CRITICAL(EntityTypes1_10.EntityType.ARROW, 16, MetaType1_7_6_10.Byte, MetaType1_8.Byte),
|
||||
FIREWORK_INFO(EntityTypes1_10.EntityType.FIREWORK, 8, MetaType1_7_6_10.Slot, MetaType1_8.Slot),
|
||||
ITEM_FRAME_ITEM(EntityTypes1_10.EntityType.ITEM_FRAME, 2, MetaType1_7_6_10.Slot, 8, MetaType1_8.Slot),
|
||||
ITEM_FRAME_ROTATION(EntityTypes1_10.EntityType.ITEM_FRAME, 3, MetaType1_7_6_10.Byte, 9, MetaType1_8.Byte),
|
||||
ENDER_CRYSTAL_HEALTH(EntityTypes1_10.EntityType.ENDER_CRYSTAL, 8, MetaType1_7_6_10.Int, 9, MetaType1_8.Int),
|
||||
;
|
||||
|
||||
private final static HashMap<Pair<EntityTypes1_10.EntityType, Integer>, MetaIndex1_7_6_10To1_8> metadataRewrites = new HashMap<>();
|
||||
|
||||
static {
|
||||
for (MetaIndex1_7_6_10To1_8 index : MetaIndex1_7_6_10To1_8.values()) {
|
||||
metadataRewrites.put(new Pair<>(index.getClazz(), index.getNewIndex()), index);
|
||||
}
|
||||
}
|
||||
|
||||
private final EntityTypes1_10.EntityType clazz;
|
||||
private final int newIndex;
|
||||
private final MetaType1_8 newType;
|
||||
private final MetaType1_7_6_10 oldType;
|
||||
private final int index;
|
||||
|
||||
MetaIndex1_7_6_10To1_8(EntityTypes1_10.EntityType type, int index, MetaType1_7_6_10 oldType, MetaType1_8 newType) {
|
||||
this.clazz = type;
|
||||
this.index = index;
|
||||
this.newIndex = index;
|
||||
this.oldType = oldType;
|
||||
this.newType = newType;
|
||||
}
|
||||
|
||||
MetaIndex1_7_6_10To1_8(EntityTypes1_10.EntityType type, int index, MetaType1_7_6_10 oldType, int newIndex, MetaType1_8 newType) {
|
||||
this.clazz = type;
|
||||
this.index = index;
|
||||
this.oldType = oldType;
|
||||
this.newIndex = newIndex;
|
||||
this.newType = newType;
|
||||
}
|
||||
|
||||
private static Optional<MetaIndex1_7_6_10To1_8> getIndex(EntityType type, int index) {
|
||||
Pair<EntityType, Integer> pair = new Pair<>(type, index);
|
||||
if (metadataRewrites.containsKey(pair)) {
|
||||
return Optional.of(metadataRewrites.get(pair));
|
||||
}
|
||||
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
public EntityTypes1_10.EntityType getClazz() {
|
||||
return clazz;
|
||||
}
|
||||
|
||||
public int getNewIndex() {
|
||||
return newIndex;
|
||||
}
|
||||
|
||||
public MetaType1_8 getNewType() {
|
||||
return newType;
|
||||
}
|
||||
|
||||
public MetaType1_7_6_10 getOldType() {
|
||||
return oldType;
|
||||
}
|
||||
|
||||
public int getIndex() {
|
||||
return index;
|
||||
}
|
||||
|
||||
public static MetaIndex1_7_6_10To1_8 searchIndex(EntityType type, int index) {
|
||||
EntityType currentType = type;
|
||||
do {
|
||||
Optional<MetaIndex1_7_6_10To1_8> optMeta = getIndex(currentType, index);
|
||||
|
||||
if (optMeta.isPresent()) {
|
||||
return optMeta.get();
|
||||
}
|
||||
|
||||
currentType = currentType.getParent();
|
||||
} while (currentType != null);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
-114
@@ -1,114 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
|
||||
@SuppressWarnings({"deprecation"})
|
||||
public class MetadataRewriter {
|
||||
|
||||
private final Protocol1_7_6_10To1_8 protocol;
|
||||
|
||||
public MetadataRewriter(Protocol1_7_6_10To1_8 protocol) {
|
||||
this.protocol = protocol;
|
||||
}
|
||||
|
||||
public void transform(EntityType type, List<Metadata> list) {
|
||||
for (Metadata entry : new ArrayList<>(list)) {
|
||||
final MetaIndex1_7_6_10To1_8 metaIndex = MetaIndex1_7_6_10To1_8.searchIndex(type, entry.id());
|
||||
try {
|
||||
if (metaIndex == null) {
|
||||
ViaRewind.getPlatform().getLogger().warning("Could not find 1.8 metadata for " + type + " with index " + entry.id());
|
||||
list.remove(entry);
|
||||
continue;
|
||||
}
|
||||
if (metaIndex.getOldType() == MetaType1_7_6_10.NonExistent) {
|
||||
list.remove(entry);
|
||||
continue;
|
||||
}
|
||||
final Object value = entry.getValue();
|
||||
entry.setTypeAndValue(metaIndex.getNewType(), value);
|
||||
entry.setMetaTypeUnsafe(metaIndex.getOldType());
|
||||
entry.setId(metaIndex.getIndex());
|
||||
|
||||
switch (metaIndex.getOldType()) {
|
||||
case Int:
|
||||
if (metaIndex.getNewType() == MetaType1_8.Byte) {
|
||||
entry.setValue(((Byte) value).intValue());
|
||||
if (metaIndex == MetaIndex1_7_6_10To1_8.ENTITY_AGEABLE_AGE) {
|
||||
if ((Integer) entry.getValue() < 0) {
|
||||
entry.setValue(-25000);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (metaIndex.getNewType() == MetaType1_8.Short) {
|
||||
entry.setValue(((Short) value).intValue());
|
||||
}
|
||||
if (metaIndex.getNewType() == MetaType1_8.Int) {
|
||||
entry.setValue(value);
|
||||
}
|
||||
break;
|
||||
case Byte:
|
||||
if (metaIndex.getNewType() == MetaType1_8.Int) {
|
||||
entry.setValue(((Integer) value).byteValue());
|
||||
}
|
||||
if (metaIndex.getNewType() == MetaType1_8.Byte) {
|
||||
if (metaIndex == MetaIndex1_7_6_10To1_8.ITEM_FRAME_ROTATION) {
|
||||
entry.setValue(Integer.valueOf((Byte) value % 4).byteValue());
|
||||
} else {
|
||||
entry.setValue(value);
|
||||
}
|
||||
}
|
||||
if (metaIndex == MetaIndex1_7_6_10To1_8.HUMAN_SKIN_FLAGS) {
|
||||
byte flags = (byte) value;
|
||||
boolean cape = (flags & 0x01) != 0;
|
||||
flags = (byte) (cape ? 0x00 : 0x02);
|
||||
entry.setValue(flags);
|
||||
}
|
||||
break;
|
||||
case Slot:
|
||||
entry.setValue(protocol.getItemRewriter().handleItemToClient((Item) value));
|
||||
break;
|
||||
case Float:
|
||||
case String:
|
||||
case Short:
|
||||
case Position:
|
||||
break;
|
||||
default:
|
||||
ViaRewind.getPlatform().getLogger().warning("Could not transform metadata for " + type + " with index " + entry.id() + " and type " + metaIndex.getOldType());
|
||||
list.remove(entry);
|
||||
break;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.WARNING, "Unable to transform metadata", e);
|
||||
list.remove(entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model;
|
||||
|
||||
public class FurnaceData {
|
||||
|
||||
public short fuelLeft = 0;
|
||||
public short maxFuel = 0;
|
||||
public short progress = 0;
|
||||
public short maxProgress = 200;
|
||||
}
|
||||
-319
@@ -1,319 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetaIndex1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetadataRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viarewind.utils.math.AABB;
|
||||
import com.viaversion.viarewind.utils.math.Vector3d;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
// Close this class file while you still can, because it's about to get ugly
|
||||
public class VirtualHologramEntity {
|
||||
private final List<Metadata> metadataTracker = new ArrayList<>();
|
||||
private double locX, locY, locZ;
|
||||
|
||||
private final UserConnection user;
|
||||
private final MetadataRewriter metadataRewriter;
|
||||
private final int entityId;
|
||||
|
||||
private int[] entityIds = null;
|
||||
private State currentState = null;
|
||||
private String name = null;
|
||||
private float yaw, pitch;
|
||||
private float headYaw;
|
||||
private boolean small = false;
|
||||
private boolean marker = false;
|
||||
|
||||
public VirtualHologramEntity(final UserConnection user, final MetadataRewriter metadataRewriter, final int entityId) {
|
||||
this.user = user;
|
||||
this.metadataRewriter = metadataRewriter;
|
||||
this.entityId = entityId;
|
||||
}
|
||||
|
||||
public void updateReplacementPosition(double x, double y, double z) {
|
||||
if (x == this.locX && y == this.locY && z == this.locZ) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.locX = x;
|
||||
this.locY = y;
|
||||
this.locZ = z;
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void handleOriginalMovementPacket(double x, double y, double z) {
|
||||
if (x == 0.0 && y == 0.0 && z == 0.0) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.locX += x;
|
||||
this.locY += y;
|
||||
this.locZ += z;
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void setYawPitch(float yaw, float pitch) {
|
||||
if (this.yaw == yaw || this.headYaw == yaw || this.pitch == pitch) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.yaw = yaw;
|
||||
this.headYaw = yaw;
|
||||
this.pitch = pitch;
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void setHeadYaw(float yaw) {
|
||||
if (this.headYaw == yaw) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.headYaw = yaw;
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void updateMetadata(final List<Metadata> metadataList) {
|
||||
for (Metadata metadata : metadataList) {
|
||||
metadataTracker.removeIf(m -> m.id() == metadata.id());
|
||||
metadataTracker.add(metadata);
|
||||
}
|
||||
|
||||
updateState();
|
||||
}
|
||||
|
||||
public void updateState() {
|
||||
byte flags = 0;
|
||||
byte armorStandFlags = 0;
|
||||
for (Metadata metadata : metadataTracker) {
|
||||
if (metadata.id() == 0 && metadata.metaType() == MetaType1_8.Byte) {
|
||||
flags = ((Number) metadata.getValue()).byteValue();
|
||||
} else if (metadata.id() == 2 && metadata.metaType() == MetaType1_8.String) {
|
||||
name = metadata.getValue().toString();
|
||||
if (name != null && name.isEmpty()) name = null;
|
||||
} else if (metadata.id() == 10 && metadata.metaType() == MetaType1_8.Byte) {
|
||||
armorStandFlags = ((Number) metadata.getValue()).byteValue();
|
||||
}
|
||||
}
|
||||
final boolean invisible = (flags & 0x20) != 0;
|
||||
small = (armorStandFlags & 0x01) != 0;
|
||||
marker = (armorStandFlags & 0x10) != 0;
|
||||
|
||||
State prevState = currentState;
|
||||
if (invisible && name != null) {
|
||||
currentState = State.HOLOGRAM;
|
||||
} else {
|
||||
currentState = State.ZOMBIE;
|
||||
}
|
||||
|
||||
if (currentState != prevState) {
|
||||
deleteEntity();
|
||||
sendSpawnPacket();
|
||||
} else {
|
||||
updateMetadata();
|
||||
updateLocation(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateLocation(boolean remount) {
|
||||
if (entityIds == null) return;
|
||||
|
||||
if (currentState == State.ZOMBIE) {
|
||||
teleportEntity(entityId, locX, locY, locZ, yaw, pitch);
|
||||
|
||||
final PacketWrapper entityHeadLook = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_HEAD_LOOK, user);
|
||||
|
||||
entityHeadLook.write(Type.INT, entityId);
|
||||
entityHeadLook.write(Type.BYTE, (byte) ((headYaw / 360f) * 256));
|
||||
|
||||
PacketUtil.sendPacket(entityHeadLook, Protocol1_7_6_10To1_8.class, true, true);
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
if (remount) {
|
||||
PacketWrapper detach = PacketWrapper.create(ClientboundPackets1_7_2_5.ATTACH_ENTITY, null, user);
|
||||
detach.write(Type.INT, entityIds[1]);
|
||||
detach.write(Type.INT, -1);
|
||||
detach.write(Type.BOOLEAN, false);
|
||||
PacketUtil.sendPacket(detach, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
// Don't ask me where this offset is coming from
|
||||
teleportEntity(entityIds[0], locX, (locY + (marker ? 54.85 : small ? 56 : 57) - 0.16), locZ, 0, 0); // Skull
|
||||
|
||||
if (remount) {
|
||||
teleportEntity(entityIds[1], locX, locY + 56.75, locZ, 0, 0); // Horse
|
||||
|
||||
PacketWrapper attach = PacketWrapper.create(ClientboundPackets1_7_2_5.ATTACH_ENTITY, null, user);
|
||||
attach.write(Type.INT, entityIds[1]);
|
||||
attach.write(Type.INT, entityIds[0]);
|
||||
attach.write(Type.BOOLEAN, false);
|
||||
PacketUtil.sendPacket(attach, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void teleportEntity(final int entityId, final double x, final double y, final double z, final float yaw, final float pitch) {
|
||||
final PacketWrapper entityTeleport = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_TELEPORT, user);
|
||||
|
||||
entityTeleport.write(Type.INT, entityId); // entity id
|
||||
entityTeleport.write(Type.INT, (int) (x * 32.0)); // x
|
||||
entityTeleport.write(Type.INT, (int) (y * 32.0)); // y
|
||||
entityTeleport.write(Type.INT, (int) (z * 32.0)); // z
|
||||
entityTeleport.write(Type.BYTE, (byte) ((yaw / 360f) * 256)); // yaw
|
||||
entityTeleport.write(Type.BYTE, (byte) ((pitch / 360f) * 256)); // pitch
|
||||
|
||||
PacketUtil.sendPacket(entityTeleport, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
protected void spawnEntity(final int entityId, final int type, final double locX, final double locY, final double locZ) {
|
||||
final PacketWrapper spawnMob = PacketWrapper.create(ClientboundPackets1_7_2_5.SPAWN_MOB, null, user);
|
||||
|
||||
spawnMob.write(Type.VAR_INT, entityId); // entity id
|
||||
spawnMob.write(Type.UNSIGNED_BYTE, (short) type); // type
|
||||
spawnMob.write(Type.INT, (int) (locX * 32.0)); // x
|
||||
spawnMob.write(Type.INT, (int) (locY * 32.0)); // y
|
||||
spawnMob.write(Type.INT, (int) (locZ * 32.0)); // z
|
||||
spawnMob.write(Type.BYTE, (byte) 0); // yaw
|
||||
spawnMob.write(Type.BYTE, (byte) 0); // pitch
|
||||
spawnMob.write(Type.BYTE, (byte) 0); // head pitch
|
||||
spawnMob.write(Type.SHORT, (short) 0); // velocity x
|
||||
spawnMob.write(Type.SHORT, (short) 0); // velocity y
|
||||
spawnMob.write(Type.SHORT, (short) 0); // velocity z
|
||||
spawnMob.write(Types1_7_6_10.METADATA_LIST, new ArrayList<>()); // metadata
|
||||
|
||||
PacketUtil.sendPacket(spawnMob, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
public void updateMetadata() {
|
||||
if (entityIds == null) return;
|
||||
|
||||
PacketWrapper metadataPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_METADATA, null, user);
|
||||
|
||||
if (currentState == State.ZOMBIE) {
|
||||
writeZombieMeta(metadataPacket);
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
writeHologramMeta(metadataPacket);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
PacketUtil.sendPacket(metadataPacket, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
private void writeZombieMeta(PacketWrapper metadataPacket) {
|
||||
metadataPacket.write(Type.INT, entityIds[0]);
|
||||
|
||||
List<Metadata> metadataList = new ArrayList<>();
|
||||
for (Metadata metadata : metadataTracker) {
|
||||
if (metadata.id() < 0 || metadata.id() > 9) continue;
|
||||
metadataList.add(new Metadata(metadata.id(), metadata.metaType(), metadata.getValue()));
|
||||
}
|
||||
if (small) metadataList.add(new Metadata(12, MetaType1_8.Byte, (byte) 1));
|
||||
metadataRewriter.transform(EntityTypes1_10.EntityType.ZOMBIE, metadataList);
|
||||
|
||||
metadataPacket.write(Types1_7_6_10.METADATA_LIST, metadataList);
|
||||
}
|
||||
|
||||
private void writeHologramMeta(PacketWrapper metadataPacket) {
|
||||
metadataPacket.write(Type.INT, entityIds[1]);
|
||||
|
||||
List<Metadata> metadataList = new ArrayList<>();
|
||||
metadataList.add(new Metadata(MetaIndex1_7_6_10To1_8.ENTITY_AGEABLE_AGE.getIndex(), MetaType1_7_6_10.Int, -1700000));
|
||||
metadataList.add(new Metadata(MetaIndex1_7_6_10To1_8.ENTITY_LIVING_NAME_TAG.getIndex(), MetaType1_7_6_10.String, name));
|
||||
metadataList.add(new Metadata(MetaIndex1_7_6_10To1_8.ENTITY_LIVING_NAME_TAG_VISIBILITY.getIndex(), MetaType1_7_6_10.Byte, (byte) 1));
|
||||
|
||||
metadataPacket.write(Types1_7_6_10.METADATA_LIST, metadataList);
|
||||
}
|
||||
|
||||
public void sendSpawnPacket() {
|
||||
if (entityIds != null) deleteEntity();
|
||||
|
||||
if (currentState == State.ZOMBIE) {
|
||||
spawnEntity(entityId, 54, locX, locY, locZ);
|
||||
|
||||
entityIds = new int[]{entityId};
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
int[] entityIds = {entityId, additionalEntityId()};
|
||||
|
||||
PacketWrapper spawnSkull = PacketWrapper.create(ClientboundPackets1_7_2_5.SPAWN_ENTITY, null, user);
|
||||
spawnSkull.write(Type.VAR_INT, entityIds[0]);
|
||||
spawnSkull.write(Type.BYTE, (byte) 66);
|
||||
spawnSkull.write(Type.INT, (int) (locX * 32.0));
|
||||
spawnSkull.write(Type.INT, (int) (locY * 32.0));
|
||||
spawnSkull.write(Type.INT, (int) (locZ * 32.0));
|
||||
spawnSkull.write(Type.BYTE, (byte) 0);
|
||||
spawnSkull.write(Type.BYTE, (byte) 0);
|
||||
spawnSkull.write(Type.INT, 0);
|
||||
PacketUtil.sendPacket(spawnSkull, Protocol1_7_6_10To1_8.class, true, true);
|
||||
|
||||
spawnEntity(entityIds[1], 100, locX, locY, locZ); // Horse
|
||||
|
||||
this.entityIds = entityIds;
|
||||
}
|
||||
|
||||
updateMetadata();
|
||||
updateLocation(true);
|
||||
}
|
||||
|
||||
public AABB getBoundingBox() {
|
||||
final double width = this.small ? 0.25 : 0.5;
|
||||
final double height = this.small ? 0.9875 : 1.975;
|
||||
|
||||
final Vector3d min = new Vector3d(this.locX - width / 2, this.locY, this.locZ - width / 2);
|
||||
final Vector3d max = new Vector3d(this.locX + width / 2, this.locY + height, this.locZ + width / 2);
|
||||
|
||||
return new AABB(min, max);
|
||||
}
|
||||
|
||||
private int additionalEntityId() {
|
||||
return Integer.MAX_VALUE - 16000 - entityId;
|
||||
}
|
||||
|
||||
public void deleteEntity() {
|
||||
if (entityIds == null) return;
|
||||
|
||||
PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, null, user);
|
||||
despawn.write(Type.BYTE, (byte) entityIds.length);
|
||||
for (int id : entityIds) {
|
||||
despawn.write(Type.INT, id);
|
||||
}
|
||||
entityIds = null;
|
||||
PacketUtil.sendPacket(despawn, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
private enum State {
|
||||
HOLOGRAM, ZOMBIE
|
||||
}
|
||||
|
||||
public int getEntityId() {
|
||||
return entityId;
|
||||
}
|
||||
}
|
||||
-359
@@ -1,359 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.VirtualHologramEntity;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.EntityTracker1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class EntityPackets {
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_EQUIPMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.SHORT); // slot
|
||||
map(Type.ITEM1_8, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
|
||||
|
||||
// remap item
|
||||
handler(wrapper -> {
|
||||
final Item item = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0);
|
||||
protocol.getItemRewriter().handleItemToClient(item);
|
||||
wrapper.set(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0, item);
|
||||
});
|
||||
|
||||
handler(wrapper -> {
|
||||
final short slot = wrapper.get(Type.SHORT, 0);
|
||||
final UUID uuid = wrapper.user().get(EntityTracker1_7_6_10.class).getPlayerUUID(wrapper.get(Type.INT, 0));
|
||||
if (uuid == null) return;
|
||||
|
||||
final Item item = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0);
|
||||
wrapper.user().get(PlayerSessionStorage.class).setPlayerEquipment(uuid, item, slot);
|
||||
|
||||
final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
|
||||
GameProfileStorage.GameProfile profile = storage.get(uuid);
|
||||
if (profile != null && profile.gamemode == 3) { // spectator mode didn't exist in 1.7.10
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.USE_BED, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.POSITION1_8, Types1_7_6_10.U_BYTE_POSITION); // position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.COLLECT_ITEM, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // collected entity id
|
||||
map(Type.VAR_INT, Type.INT); // collector entity id
|
||||
|
||||
handler(wrapper -> wrapper.user().get(EntityTracker1_7_6_10.class).removeEntity(wrapper.get(Type.INT, 0)));
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_VELOCITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
|
||||
map(Type.SHORT); // velocity x
|
||||
map(Type.SHORT); // velocity y
|
||||
map(Type.SHORT); // velocity z
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.DESTROY_ENTITIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT_ARRAY_PRIMITIVE, Types1_7_6_10.BYTE_INT_ARRAY); // entity ids
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
for (int entityId : wrapper.get(Types1_7_6_10.BYTE_INT_ARRAY, 0)) {
|
||||
tracker.removeEntity(entityId);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_MOVEMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // x
|
||||
map(Type.BYTE); // y
|
||||
map(Type.BYTE); // z
|
||||
read(Type.BOOLEAN); // on ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getVirtualHologramMap().get(wrapper.get(Type.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Type.BYTE, 0);
|
||||
final int y = wrapper.get(Type.BYTE, 1);
|
||||
final int z = wrapper.get(Type.BYTE, 2);
|
||||
|
||||
hologram.handleOriginalMovementPacket(x / 32.0, y / 32.0, z / 32.0);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
read(Type.BOOLEAN); // on ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getVirtualHologramMap().get(wrapper.get(Type.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int yaw = wrapper.get(Type.BYTE, 0);
|
||||
final int pitch = wrapper.get(Type.BYTE, 1);
|
||||
|
||||
hologram.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_POSITION_AND_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // x
|
||||
map(Type.BYTE); // y
|
||||
map(Type.BYTE); // z
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
read(Type.BOOLEAN); // on ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getVirtualHologramMap().get(wrapper.get(Type.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Type.BYTE, 0);
|
||||
final int y = wrapper.get(Type.BYTE, 1);
|
||||
final int z = wrapper.get(Type.BYTE, 2);
|
||||
|
||||
final int yaw = wrapper.get(Type.BYTE, 3);
|
||||
final int pitch = wrapper.get(Type.BYTE, 4);
|
||||
|
||||
hologram.handleOriginalMovementPacket(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_TELEPORT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
read(Type.BOOLEAN); // on ground
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final int entityId = wrapper.get(Type.INT, 0);
|
||||
final EntityType type = tracker.getEntityMap().get(entityId);
|
||||
|
||||
if (type == EntityTypes1_10.EntityType.MINECART_ABSTRACT) { // TODO | Realign all entities?
|
||||
int y = wrapper.get(Type.INT, 2);
|
||||
y += 12;
|
||||
wrapper.set(Type.INT, 2, y);
|
||||
}
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getVirtualHologramMap().get(entityId);
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Type.INT, 1);
|
||||
final int y = wrapper.get(Type.INT, 2);
|
||||
final int z = wrapper.get(Type.INT, 3);
|
||||
|
||||
final int yaw = wrapper.get(Type.BYTE, 0);
|
||||
final int pitch = wrapper.get(Type.BYTE, 1);
|
||||
|
||||
hologram.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_HEAD_LOOK, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // head yaw
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getVirtualHologramMap().get(wrapper.get(Type.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int yaw = wrapper.get(Type.BYTE, 0);
|
||||
|
||||
hologram.setHeadYaw(yaw * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ATTACH_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT); // riding entity id
|
||||
map(Type.INT); // vehicle entity id
|
||||
map(Type.BOOLEAN); // leash state
|
||||
handler(packetWrapper -> {
|
||||
final boolean leash = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
if (!leash) {
|
||||
final EntityTracker1_7_6_10 tracker = packetWrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final int passenger = packetWrapper.get(Type.INT, 0);
|
||||
final int vehicle = packetWrapper.get(Type.INT, 1);
|
||||
|
||||
tracker.setPassenger(vehicle, passenger);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_METADATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Types1_8.METADATA_LIST, Types1_7_6_10.METADATA_LIST); // metadata
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Type.INT, 0);
|
||||
final List<Metadata> metadataList = wrapper.get(Types1_7_6_10.METADATA_LIST, 0);
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
if (tracker.getEntityReplacementMap().containsKey(entityId)) {
|
||||
tracker.updateMetadata(entityId, metadataList);
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
if (tracker.getEntityMap().containsKey(entityId)) {
|
||||
protocol.getMetadataRewriter().transform(tracker.getEntityMap().get(entityId), metadataList);
|
||||
if (metadataList.isEmpty()) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
} else {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // effect id
|
||||
map(Type.BYTE); // amplifier
|
||||
map(Type.VAR_INT, Type.SHORT); // duration
|
||||
read(Type.BYTE); // hide particles
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.REMOVE_ENTITY_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
map(Type.BYTE); // effect id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_PROPERTIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // entity id
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Type.INT, 0);
|
||||
if (wrapper.user().get(EntityTracker1_7_6_10.class).getEntityReplacementMap().containsKey(entityId)) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
final int amount = wrapper.passthrough(Type.INT);
|
||||
for (int i = 0; i < amount; i++) {
|
||||
wrapper.passthrough(Type.STRING); // id
|
||||
wrapper.passthrough(Type.DOUBLE); // value
|
||||
|
||||
int modifierLength = wrapper.read(Type.VAR_INT);
|
||||
wrapper.write(Type.SHORT, (short) modifierLength);
|
||||
for (int j = 0; j < modifierLength; j++) {
|
||||
wrapper.passthrough(Type.UUID); // modifier uuid
|
||||
wrapper.passthrough(Type.DOUBLE); // modifier amount
|
||||
wrapper.passthrough(Type.BYTE); // modifier operation
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.UPDATE_ENTITY_NBT);
|
||||
}
|
||||
}
|
||||
-269
@@ -1,269 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.FurnaceData;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.InventoryTracker;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.gson.JsonElement;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class InventoryPackets {
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.OPEN_WINDOW, wrapper -> {
|
||||
final InventoryTracker windowTracker = wrapper.user().get(InventoryTracker.class);
|
||||
|
||||
final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE); // window id
|
||||
final short windowTypeId = InventoryTracker.getInventoryType(wrapper.read(Type.STRING)); // window type
|
||||
|
||||
windowTracker.getWindowTypeMap().put(windowId, windowTypeId);
|
||||
wrapper.write(Type.UNSIGNED_BYTE, windowTypeId); // window type id
|
||||
|
||||
final JsonElement titleComponent = wrapper.read(Type.COMPONENT); // Title
|
||||
String title = ChatUtil.jsonToLegacy(titleComponent);
|
||||
title = ChatUtil.removeUnusedColor(title, '8');
|
||||
if (title.length() > 32) {
|
||||
title = title.substring(0, 32);
|
||||
}
|
||||
wrapper.write(Type.STRING, title); // window title
|
||||
|
||||
wrapper.passthrough(Type.UNSIGNED_BYTE); // slots count
|
||||
wrapper.write(Type.BOOLEAN, true); // use provided window title
|
||||
|
||||
if (windowTypeId == 11) { // Horse
|
||||
wrapper.passthrough(Type.INT); // entity id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CLOSE_WINDOW, wrapper -> {
|
||||
final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE); // window id
|
||||
|
||||
wrapper.user().get(InventoryTracker.class).remove(windowId);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_SLOT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE); // window id
|
||||
map(Type.SHORT); // slot
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Type.UNSIGNED_BYTE, 0));
|
||||
final short slot = wrapper.get(Type.SHORT, 0);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
if (slot == 1) {
|
||||
wrapper.cancel();
|
||||
} else if (slot >= 2) {
|
||||
wrapper.set(Type.SHORT, 0, (short) (slot - 1));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
map(Type.ITEM1_8, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
|
||||
|
||||
// remap item
|
||||
handler(wrapper -> {
|
||||
final Item item = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0);
|
||||
protocol.getItemRewriter().handleItemToClient(item);
|
||||
|
||||
wrapper.set(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0, item);
|
||||
});
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
if (windowId != 0) return;
|
||||
|
||||
final short slot = wrapper.get(Type.SHORT, 0);
|
||||
if (slot < 5 || slot > 8) return;
|
||||
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
final Item item = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0);
|
||||
|
||||
playerSession.setPlayerEquipment(wrapper.user().getProtocolInfo().getUuid(), item, 8 - slot);
|
||||
if (playerSession.isSpectator()) { // Spectator mode didn't exist in 1.7.10
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.WINDOW_ITEMS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE); // window id
|
||||
|
||||
// remap enchantment table items
|
||||
handler(wrapper -> {
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Type.UNSIGNED_BYTE, 0));
|
||||
|
||||
Item[] items = wrapper.read(Type.ITEM1_8_SHORT_ARRAY);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
Item[] old = items;
|
||||
items = new Item[old.length - 1];
|
||||
items[0] = old[0];
|
||||
System.arraycopy(old, 2, items, 1, old.length - 3);
|
||||
}
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
items[i] = protocol.getItemRewriter().handleItemToClient(items[i]);
|
||||
}
|
||||
wrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM_ARRAY, items); // items
|
||||
});
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
if (windowId != 0) return;
|
||||
|
||||
final UUID userId = wrapper.user().getProtocolInfo().getUuid();
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
|
||||
final Item[] items = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM_ARRAY, 0);
|
||||
for (int i = 5; i < 9; i++) {
|
||||
playerSession.setPlayerEquipment(userId, items[i], 8 - i);
|
||||
if (playerSession.isSpectator()) {
|
||||
items[i] = null;
|
||||
}
|
||||
}
|
||||
if (playerSession.isSpectator()) {
|
||||
final GameProfileStorage.GameProfile profile = wrapper.user().get(GameProfileStorage.class).get(userId);
|
||||
if (profile != null) {
|
||||
items[5] = profile.getSkull();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.WINDOW_PROPERTY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE); // window id
|
||||
map(Type.SHORT); // progress bar id
|
||||
map(Type.SHORT); // progress bar value
|
||||
|
||||
handler(wrapper -> {
|
||||
final InventoryTracker windowTracker = wrapper.user().get(InventoryTracker.class);
|
||||
|
||||
final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
final short windowType = windowTracker.get(windowId);
|
||||
|
||||
final short progressBarId = wrapper.get(Type.SHORT, 0);
|
||||
short progress = wrapper.get(Type.SHORT, 1);
|
||||
|
||||
if (windowType == 2) { // Furnace
|
||||
final FurnaceData furnace = windowTracker.getFurnaceData().computeIfAbsent(windowId, x -> new FurnaceData());
|
||||
if (progressBarId == 0 || progressBarId == 1) {
|
||||
if (progressBarId == 0) {
|
||||
furnace.fuelLeft = progress;
|
||||
} else {
|
||||
furnace.maxFuel = progress;
|
||||
}
|
||||
if (furnace.maxFuel == 0) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
progress = (short) (200 * furnace.fuelLeft / furnace.maxFuel);
|
||||
wrapper.set(Type.SHORT, 0, (short) 1);
|
||||
wrapper.set(Type.SHORT, 1, progress);
|
||||
} else if (progressBarId == 2 || progressBarId == 3) {
|
||||
if (progressBarId == 2) {
|
||||
furnace.progress = progress;
|
||||
} else {
|
||||
furnace.maxProgress = progress;
|
||||
}
|
||||
if (furnace.maxProgress == 0) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
progress = (short) (200 * furnace.progress / furnace.maxProgress);
|
||||
wrapper.set(Type.SHORT, 0, (short) 0);
|
||||
wrapper.set(Type.SHORT, 1, progress);
|
||||
}
|
||||
} else if (windowType == 4 && progressBarId > 2) { // Enchanting Table
|
||||
wrapper.cancel();
|
||||
} else if (windowType == 8) { // Anvil
|
||||
windowTracker.levelCost = progress;
|
||||
windowTracker.anvilId = windowId;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CLOSE_WINDOW, wrapper -> {
|
||||
final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE);
|
||||
|
||||
wrapper.user().get(InventoryTracker.class).remove(windowId);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CLICK_WINDOW, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BYTE, Type.UNSIGNED_BYTE); // window id
|
||||
map(Type.SHORT); // slot
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0); //Window Id
|
||||
final short slot = wrapper.get(Type.SHORT, 0);
|
||||
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(windowId);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
if (slot > 0) {
|
||||
wrapper.set(Type.SHORT, 0, (short) (slot + 1));
|
||||
}
|
||||
}
|
||||
});
|
||||
map(Type.BYTE); // button
|
||||
map(Type.SHORT); // action number
|
||||
map(Type.BYTE); // mode
|
||||
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM1_8); // clicked item
|
||||
|
||||
// remap item
|
||||
handler(wrapper -> {
|
||||
final Item item = wrapper.get(Type.ITEM1_8, 0);
|
||||
protocol.getItemRewriter().handleItemToServer(item);
|
||||
wrapper.set(Type.ITEM1_8, 0, item);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.SHORT); // slot
|
||||
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM1_8); // item
|
||||
|
||||
// remap item
|
||||
handler(wrapper -> {
|
||||
final Item item = wrapper.get(Type.ITEM1_8, 0);
|
||||
protocol.getItemRewriter().handleItemToServer(item);
|
||||
wrapper.set(Type.ITEM1_8, 0, item);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-917
@@ -1,917 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.TitleRenderProvider;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.*;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viarewind.utils.math.AABB;
|
||||
import com.viaversion.viarewind.utils.math.Ray3d;
|
||||
import com.viaversion.viarewind.utils.math.RayTracing;
|
||||
import com.viaversion.viarewind.utils.math.Vector3d;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.minecraft.Environment;
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.gson.JsonElement;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.util.ComponentUtil;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerPackets {
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.JOIN_GAME, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT); // entity id
|
||||
map(Type.UNSIGNED_BYTE);// game mode
|
||||
map(Type.BYTE); // dimension
|
||||
map(Type.UNSIGNED_BYTE); // difficulty
|
||||
map(Type.UNSIGNED_BYTE); // max players
|
||||
map(Type.STRING); // level type
|
||||
read(Type.BOOLEAN); // reduced debug info
|
||||
|
||||
handler(wrapper -> {
|
||||
if (ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 2) { // adventure
|
||||
wrapper.set(Type.UNSIGNED_BYTE, 0, (short) 0); // survival
|
||||
}
|
||||
}
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
tracker.setClientEntityId(wrapper.get(Type.INT, 0));
|
||||
tracker.addPlayer(wrapper.get(Type.INT, 0), wrapper.user().getProtocolInfo().getUuid());
|
||||
|
||||
wrapper.user().get(PlayerSessionStorage.class).gameMode = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Type.BYTE, 0));
|
||||
|
||||
// Reset on Velocity server change
|
||||
wrapper.user().put(new Scoreboard(wrapper.user()));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CHAT_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.COMPONENT); // chat message
|
||||
handler(wrapper -> {
|
||||
final int position = wrapper.read(Type.BYTE);
|
||||
if (position == 2) { // above hotbar
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.INT_POSITION); // spawn position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_HEALTH, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT); // health
|
||||
map(Type.VAR_INT, Type.SHORT); // food
|
||||
map(Type.FLOAT); // food saturation
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.RESPAWN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT); // dimension
|
||||
map(Type.UNSIGNED_BYTE); // difficulty
|
||||
map(Type.UNSIGNED_BYTE); // game mode
|
||||
map(Type.STRING); // level type
|
||||
handler(wrapper -> {
|
||||
if (ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
if (wrapper.get(Type.UNSIGNED_BYTE, 1) == 2) {
|
||||
wrapper.set(Type.UNSIGNED_BYTE, 1, (short) 0);
|
||||
}
|
||||
}
|
||||
|
||||
wrapper.user().get(PlayerSessionStorage.class).gameMode = wrapper.get(Type.UNSIGNED_BYTE, 1);
|
||||
|
||||
final ClientWorld world = wrapper.user().get(ClientWorld.class);
|
||||
final Environment dimension = Environment.getEnvironmentById(wrapper.get(Type.INT, 0));
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
if (world.getEnvironment() != dimension) {
|
||||
world.setEnvironment(dimension.id());
|
||||
|
||||
// Reset on dimension change
|
||||
tracker.clear();
|
||||
tracker.getEntityMap().put(tracker.getPlayerId(), EntityTypes1_10.EntityType.ENTITY_HUMAN);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE); // x
|
||||
map(Type.DOUBLE); // y
|
||||
map(Type.DOUBLE); // z
|
||||
map(Type.FLOAT); // yaw
|
||||
map(Type.FLOAT); // pitch
|
||||
handler(wrapper -> {
|
||||
final double x = wrapper.get(Type.DOUBLE, 0);
|
||||
double y = wrapper.get(Type.DOUBLE, 1);
|
||||
final double z = wrapper.get(Type.DOUBLE, 2);
|
||||
|
||||
final float yaw = wrapper.get(Type.FLOAT, 0);
|
||||
final float pitch = wrapper.get(Type.FLOAT, 1);
|
||||
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
final int flags = wrapper.read(Type.BYTE);
|
||||
|
||||
// x, y, and z
|
||||
if ((flags & 0x01) == 0x01) wrapper.set(Type.DOUBLE, 0, x + playerSession.getPosX());
|
||||
if ((flags & 0x02) == 0x02) y += playerSession.getPosY();
|
||||
|
||||
playerSession.receivedPosY = y;
|
||||
wrapper.set(Type.DOUBLE, 1, y + 1.62F);
|
||||
|
||||
if ((flags & 0x04) == 0x04) wrapper.set(Type.DOUBLE, 2, z + playerSession.getPosZ());
|
||||
|
||||
// yaw and pitch
|
||||
if ((flags & 0x08) == 0x08) wrapper.set(Type.FLOAT, 0, yaw + playerSession.yaw);
|
||||
if ((flags & 0x10) == 0x10) wrapper.set(Type.FLOAT, 1, pitch + playerSession.pitch);
|
||||
|
||||
wrapper.write(Type.BOOLEAN, playerSession.onGround);
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
if (tracker.spectatingPlayerId != tracker.getPlayerId()) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_EXPERIENCE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT); // experience bar
|
||||
map(Type.VAR_INT, Type.SHORT); // level
|
||||
map(Type.VAR_INT, Type.SHORT); // total experience
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.GAME_EVENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE); // reason
|
||||
map(Type.FLOAT); // value
|
||||
handler(wrapper -> {
|
||||
if (wrapper.get(Type.UNSIGNED_BYTE, 0) != 3) return; // Change game mode
|
||||
int gameMode = wrapper.get(Type.FLOAT, 0).intValue();
|
||||
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
if (gameMode == 3 || playerSession.gameMode == 3) {
|
||||
UUID myId = wrapper.user().getProtocolInfo().getUuid();
|
||||
Item[] equipment = new Item[4];
|
||||
if (gameMode == 3) {
|
||||
GameProfileStorage.GameProfile profile = wrapper.user().get(GameProfileStorage.class).get(myId);
|
||||
equipment[3] = profile == null ? null : profile.getSkull();
|
||||
} else {
|
||||
for (int i = 0; i < equipment.length; i++) {
|
||||
equipment[i] = playerSession.getPlayerEquipment(myId, i);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < equipment.length; i++) {
|
||||
PacketWrapper setSlot = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_SLOT, wrapper.user());
|
||||
setSlot.write(Type.BYTE, (byte) 0);
|
||||
setSlot.write(Type.SHORT, (short) (8 - i));
|
||||
setSlot.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, equipment[i]);
|
||||
PacketUtil.sendPacket(setSlot, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
|
||||
if (gameMode == 2 && ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
gameMode = 0;
|
||||
wrapper.set(Type.FLOAT, 0, 0.0f);
|
||||
}
|
||||
wrapper.user().get(PlayerSessionStorage.class).gameMode = gameMode;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.OPEN_SIGN_EDITOR, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.INT_POSITION); // position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_INFO, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
int action = packetWrapper.read(Type.VAR_INT);
|
||||
int count = packetWrapper.read(Type.VAR_INT);
|
||||
GameProfileStorage gameProfileStorage = packetWrapper.user().get(GameProfileStorage.class);
|
||||
for (int i = 0; i < count; i++) {
|
||||
UUID uuid = packetWrapper.read(Type.UUID);
|
||||
if (action == 0) {
|
||||
String name = packetWrapper.read(Type.STRING);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) gameProfile = gameProfileStorage.put(uuid, name);
|
||||
|
||||
int propertyCount = packetWrapper.read(Type.VAR_INT);
|
||||
while (propertyCount-- > 0) {
|
||||
String propertyName = packetWrapper.read(Type.STRING);
|
||||
String propertyValue = packetWrapper.read(Type.STRING);
|
||||
String propertySignature = packetWrapper.read(Type.OPTIONAL_STRING);
|
||||
gameProfile.properties.add(new GameProfileStorage.Property(propertyName, propertyValue, propertySignature));
|
||||
}
|
||||
|
||||
int gamemode = packetWrapper.read(Type.VAR_INT);
|
||||
int ping = packetWrapper.read(Type.VAR_INT);
|
||||
gameProfile.ping = ping;
|
||||
gameProfile.gamemode = gamemode;
|
||||
JsonElement displayName = packetWrapper.read(Type.OPTIONAL_COMPONENT);
|
||||
if (displayName != null) {
|
||||
gameProfile.setDisplayName(ChatUtil.jsonToLegacy(displayName));
|
||||
}
|
||||
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, true);
|
||||
packet.write(Type.SHORT, (short) ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
} else if (action == 1) {
|
||||
int gamemode = packetWrapper.read(Type.VAR_INT);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null || gameProfile.gamemode == gamemode) continue;
|
||||
|
||||
if (gamemode == 3 || gameProfile.gamemode == 3) {
|
||||
EntityTracker1_7_6_10 tracker = packetWrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
int entityId = tracker.getPlayerEntityId(uuid);
|
||||
boolean isOwnPlayer = entityId == tracker.getPlayerId();
|
||||
if (entityId != -1) {
|
||||
// Weirdly, PlayerEntity has only 4 slots instead of 5
|
||||
Item[] equipment = new Item[isOwnPlayer ? 4 : 5];
|
||||
if (gamemode == 3) {
|
||||
equipment[isOwnPlayer ? 3 : 4] = gameProfile.getSkull();
|
||||
} else {
|
||||
for (int j = 0; j < equipment.length; j++) {
|
||||
equipment[j] = packetWrapper.user().get(PlayerSessionStorage.class).getPlayerEquipment(uuid, j);
|
||||
}
|
||||
}
|
||||
|
||||
for (short slot = 0; slot < equipment.length; slot++) {
|
||||
PacketWrapper equipmentPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_EQUIPMENT, packetWrapper.user());
|
||||
equipmentPacket.write(Type.INT, entityId);
|
||||
equipmentPacket.write(Type.SHORT, slot);
|
||||
equipmentPacket.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, equipment[slot]);
|
||||
PacketUtil.sendPacket(equipmentPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gameProfile.gamemode = gamemode;
|
||||
} else if (action == 2) {
|
||||
int ping = packetWrapper.read(Type.VAR_INT);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) continue;
|
||||
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, false);
|
||||
packet.write(Type.SHORT, (short) gameProfile.ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
|
||||
gameProfile.ping = ping;
|
||||
|
||||
packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, true);
|
||||
packet.write(Type.SHORT, (short) ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
} else if (action == 3) {
|
||||
JsonElement displayNameComponent = packetWrapper.read(Type.OPTIONAL_COMPONENT);
|
||||
String displayName = displayNameComponent != null ? ChatUtil.jsonToLegacy(displayNameComponent) : null;
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null || gameProfile.displayName == null && displayName == null) continue;
|
||||
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, false);
|
||||
packet.write(Type.SHORT, (short) gameProfile.ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
|
||||
if (gameProfile.displayName == null && displayName != null || gameProfile.displayName != null && displayName == null || !gameProfile.displayName.equals(displayName)) {
|
||||
gameProfile.setDisplayName(displayName);
|
||||
}
|
||||
|
||||
packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, true);
|
||||
packet.write(Type.SHORT, (short) gameProfile.ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
} else if (action == 4) {
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.remove(uuid);
|
||||
if (gameProfile == null) continue;
|
||||
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, null, packetWrapper.user());
|
||||
packet.write(Type.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Type.BOOLEAN, false);
|
||||
packet.write(Type.SHORT, (short) gameProfile.ping);
|
||||
PacketUtil.sendPacket(packet, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_ABILITIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BYTE);
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
handler(packetWrapper -> {
|
||||
byte flags = packetWrapper.get(Type.BYTE, 0);
|
||||
float flySpeed = packetWrapper.get(Type.FLOAT, 0);
|
||||
float walkSpeed = packetWrapper.get(Type.FLOAT, 1);
|
||||
PlayerSessionStorage abilities = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
abilities.invincible = (flags & 8) == 8;
|
||||
abilities.allowFly = (flags & 4) == 4;
|
||||
abilities.flying = (flags & 2) == 2;
|
||||
abilities.creative = (flags & 1) == 1;
|
||||
abilities.flySpeed = flySpeed;
|
||||
abilities.walkSpeed = walkSpeed;
|
||||
|
||||
if (abilities.sprinting && abilities.flying) {
|
||||
packetWrapper.set(Type.FLOAT, 0, abilities.flySpeed * 2.0f);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLUGIN_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String channel = packetWrapper.get(Type.STRING, 0);
|
||||
if (channel.equals("MC|TrList")) {
|
||||
packetWrapper.passthrough(Type.INT); //Window Id
|
||||
|
||||
int size;
|
||||
if (packetWrapper.isReadable(Type.BYTE, 0)) {
|
||||
size = packetWrapper.passthrough(Type.BYTE);
|
||||
} else {
|
||||
size = packetWrapper.passthrough(Type.UNSIGNED_BYTE);
|
||||
}
|
||||
|
||||
for (int i = 0; i < size; i++) {
|
||||
Item item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
|
||||
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 1
|
||||
|
||||
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
|
||||
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 3
|
||||
|
||||
boolean has3Items = packetWrapper.passthrough(Type.BOOLEAN);
|
||||
if (has3Items) {
|
||||
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
|
||||
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 2
|
||||
}
|
||||
|
||||
packetWrapper.passthrough(Type.BOOLEAN); //Unavailable
|
||||
packetWrapper.read(Type.INT); //Uses
|
||||
packetWrapper.read(Type.INT); //Max Uses
|
||||
}
|
||||
} else if (channel.equals("MC|Brand")) {
|
||||
packetWrapper.write(Type.REMAINING_BYTES, packetWrapper.read(Type.STRING).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
packetWrapper.cancel();
|
||||
packetWrapper.setPacketType(null);
|
||||
ByteBuf newPacketBuf = Unpooled.buffer();
|
||||
packetWrapper.writeToBuffer(newPacketBuf);
|
||||
PacketWrapper newWrapper = PacketWrapper.create(ClientboundPackets1_7_2_5.PLUGIN_MESSAGE, newPacketBuf, packetWrapper.user());
|
||||
newWrapper.passthrough(Type.STRING);
|
||||
if (newPacketBuf.readableBytes() <= Short.MAX_VALUE) {
|
||||
newWrapper.write(Type.SHORT, (short) newPacketBuf.readableBytes());
|
||||
newWrapper.send(Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Camera
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CAMERA, null, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
|
||||
EntityTracker1_7_6_10 tracker = packetWrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
int entityId = packetWrapper.read(Type.VAR_INT);
|
||||
int spectating = tracker.spectatingPlayerId;
|
||||
|
||||
if (spectating != entityId) {
|
||||
tracker.setSpectating(entityId);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Title
|
||||
protocol.registerClientbound(ClientboundPackets1_8.TITLE, null, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
TitleRenderProvider titleRenderProvider = Via.getManager().getProviders().get(TitleRenderProvider.class);
|
||||
if (titleRenderProvider == null) return;
|
||||
int action = packetWrapper.read(Type.VAR_INT);
|
||||
UUID uuid = packetWrapper.user().getProtocolInfo().getUuid();
|
||||
switch (action) {
|
||||
case 0:
|
||||
titleRenderProvider.setTitle(uuid, packetWrapper.read(Type.STRING));
|
||||
break;
|
||||
case 1:
|
||||
titleRenderProvider.setSubTitle(uuid, packetWrapper.read(Type.STRING));
|
||||
break;
|
||||
case 2:
|
||||
titleRenderProvider.setTimings(uuid, packetWrapper.read(Type.INT), packetWrapper.read(Type.INT), packetWrapper.read(Type.INT));
|
||||
break;
|
||||
case 3:
|
||||
titleRenderProvider.clear(uuid);
|
||||
break;
|
||||
case 4:
|
||||
titleRenderProvider.reset(uuid);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player List Header And Footer
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.TAB_LIST);
|
||||
|
||||
//Resource Pack Send
|
||||
protocol.registerClientbound(ClientboundPackets1_8.RESOURCE_PACK, ClientboundPackets1_7_2_5.PLUGIN_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
create(Type.STRING, "MC|RPack");
|
||||
handler(packetWrapper -> {
|
||||
ByteBuf buf = ByteBufAllocator.DEFAULT.buffer();
|
||||
try {
|
||||
// Url
|
||||
Type.STRING.write(buf, packetWrapper.read(Type.STRING));
|
||||
|
||||
packetWrapper.write(Type.SHORT_BYTE_ARRAY, Type.REMAINING_BYTES.read(buf));
|
||||
} finally {
|
||||
buf.release();
|
||||
}
|
||||
});
|
||||
read(Type.STRING); // Hash
|
||||
}
|
||||
});
|
||||
|
||||
/* INCOMING */
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CHAT_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String msg = packetWrapper.get(Type.STRING, 0);
|
||||
int gamemode = packetWrapper.user().get(PlayerSessionStorage.class).gameMode;
|
||||
if (gamemode == 3 && msg.toLowerCase().startsWith("/stp ")) {
|
||||
String username = msg.split(" ")[1];
|
||||
GameProfileStorage storage = packetWrapper.user().get(GameProfileStorage.class);
|
||||
GameProfileStorage.GameProfile profile = storage.get(username, true);
|
||||
if (profile != null && profile.uuid != null) {
|
||||
packetWrapper.cancel();
|
||||
|
||||
PacketWrapper teleportPacket = PacketWrapper.create(0x18, null, packetWrapper.user());
|
||||
teleportPacket.write(Type.UUID, profile.uuid);
|
||||
|
||||
PacketUtil.sendToServer(teleportPacket, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.INTERACT_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT, Type.VAR_INT);
|
||||
map(Type.BYTE, Type.VAR_INT);
|
||||
handler(wrapper -> {
|
||||
int mode = wrapper.get(Type.VAR_INT, 1);
|
||||
if (mode != 0) {
|
||||
return;
|
||||
}
|
||||
final int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
|
||||
|
||||
if (tracker.getVirtualHologramMap().containsKey(entityId)) {
|
||||
final AABB boundingBox = tracker.getVirtualHologramMap().get(entityId).getBoundingBox();
|
||||
|
||||
Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());
|
||||
double yaw = Math.toRadians(position.yaw);
|
||||
double pitch = Math.toRadians(position.pitch);
|
||||
|
||||
Vector3d dir = new Vector3d(-Math.cos(pitch) * Math.sin(yaw), -Math.sin(pitch), Math.cos(pitch) * Math.cos(yaw));
|
||||
Ray3d ray = new Ray3d(pos, dir);
|
||||
Vector3d intersection = RayTracing.trace(ray, boundingBox, 5.0);
|
||||
|
||||
if (intersection == null) {
|
||||
return;
|
||||
}
|
||||
intersection.substract(boundingBox.getMin());
|
||||
|
||||
mode = 2;
|
||||
wrapper.set(Type.VAR_INT, 1, mode);
|
||||
wrapper.write(Type.FLOAT, (float) intersection.getX());
|
||||
wrapper.write(Type.FLOAT, (float) intersection.getY());
|
||||
wrapper.write(Type.FLOAT, (float) intersection.getZ());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_MOVEMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
playerSession.onGround = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE); //X
|
||||
map(Type.DOUBLE); //Y
|
||||
read(Type.DOUBLE);
|
||||
map(Type.DOUBLE); //Z
|
||||
map(Type.BOOLEAN); //OnGround
|
||||
handler(packetWrapper -> {
|
||||
double x = packetWrapper.get(Type.DOUBLE, 0);
|
||||
double feetY = packetWrapper.get(Type.DOUBLE, 1);
|
||||
double z = packetWrapper.get(Type.DOUBLE, 2);
|
||||
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
|
||||
playerSession.onGround = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
playerSession.setPos(x, feetY, z);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
playerSession.yaw = packetWrapper.get(Type.FLOAT, 0);
|
||||
playerSession.pitch = packetWrapper.get(Type.FLOAT, 1);
|
||||
playerSession.onGround = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE); //X
|
||||
map(Type.DOUBLE); //Y
|
||||
read(Type.DOUBLE);
|
||||
map(Type.DOUBLE); //Z
|
||||
map(Type.FLOAT); //Yaw
|
||||
map(Type.FLOAT); //Pitch
|
||||
map(Type.BOOLEAN); //OnGround
|
||||
handler(packetWrapper -> {
|
||||
double x = packetWrapper.get(Type.DOUBLE, 0);
|
||||
double feetY = packetWrapper.get(Type.DOUBLE, 1);
|
||||
double z = packetWrapper.get(Type.DOUBLE, 2);
|
||||
|
||||
float yaw = packetWrapper.get(Type.FLOAT, 0);
|
||||
float pitch = packetWrapper.get(Type.FLOAT, 1);
|
||||
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
|
||||
playerSession.onGround = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
playerSession.setPos(x, feetY, z);
|
||||
playerSession.yaw = yaw;
|
||||
playerSession.pitch = pitch;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_DIGGING, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); //Status
|
||||
handler(packetWrapper -> {
|
||||
int x = packetWrapper.read(Type.INT);
|
||||
int y = packetWrapper.read(Type.UNSIGNED_BYTE);
|
||||
int z = packetWrapper.read(Type.INT);
|
||||
packetWrapper.write(Type.POSITION1_8, new Position(x, y, z));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
int x = packetWrapper.read(Type.INT);
|
||||
int y = packetWrapper.read(Type.UNSIGNED_BYTE);
|
||||
int z = packetWrapper.read(Type.INT);
|
||||
packetWrapper.write(Type.POSITION1_8, new Position(x, y, z));
|
||||
|
||||
packetWrapper.passthrough(Type.BYTE); //Direction
|
||||
Item item = packetWrapper.read(Types1_7_6_10.COMPRESSED_NBT_ITEM);
|
||||
item = protocol.getItemRewriter().handleItemToServer(item);
|
||||
packetWrapper.write(Type.ITEM1_8, item);
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
packetWrapper.passthrough(Type.BYTE);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.ANIMATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.read(Type.INT);
|
||||
int animation = packetWrapper.read(Type.BYTE); //Animation
|
||||
if (animation == 1) return;
|
||||
packetWrapper.cancel();
|
||||
//1.7 vanilla client is not sending this packet with animation!=1
|
||||
switch (animation) {
|
||||
case 104:
|
||||
animation = 0;
|
||||
break;
|
||||
case 105:
|
||||
animation = 1;
|
||||
break;
|
||||
case 3:
|
||||
animation = 2;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
PacketWrapper entityAction = PacketWrapper.create(0x0B, null, packetWrapper.user());
|
||||
entityAction.write(Type.VAR_INT, entityId);
|
||||
entityAction.write(Type.VAR_INT, animation);
|
||||
entityAction.write(Type.VAR_INT, 0);
|
||||
PacketUtil.sendPacket(entityAction, Protocol1_7_6_10To1_8.class, true, true);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.ENTITY_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT, Type.VAR_INT); //Entity Id
|
||||
handler(packetWrapper -> packetWrapper.write(Type.VAR_INT, packetWrapper.read(Type.BYTE) - 1)); //Action Id
|
||||
map(Type.INT, Type.VAR_INT); //Action Parameter
|
||||
handler(packetWrapper -> {
|
||||
int action = packetWrapper.get(Type.VAR_INT, 1);
|
||||
if (action == 3 || action == 4) {
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
playerSession.sprinting = action == 3;
|
||||
PacketWrapper abilitiesPacket = PacketWrapper.create(0x39, null, packetWrapper.user());
|
||||
abilitiesPacket.write(Type.BYTE, playerSession.combineAbilities());
|
||||
abilitiesPacket.write(Type.FLOAT, playerSession.sprinting ? playerSession.flySpeed * 2.0f : playerSession.flySpeed);
|
||||
abilitiesPacket.write(Type.FLOAT, playerSession.walkSpeed);
|
||||
PacketUtil.sendPacket(abilitiesPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.STEER_VEHICLE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT); //Sideways
|
||||
map(Type.FLOAT); //Forwards
|
||||
handler(packetWrapper -> {
|
||||
boolean jump = packetWrapper.read(Type.BOOLEAN);
|
||||
boolean unmount = packetWrapper.read(Type.BOOLEAN);
|
||||
short flags = 0;
|
||||
if (jump) flags += 0x01;
|
||||
if (unmount) flags += 0x02;
|
||||
packetWrapper.write(Type.UNSIGNED_BYTE, flags);
|
||||
|
||||
if (unmount) {
|
||||
EntityTracker1_7_6_10 tracker = packetWrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
if (tracker.spectatingPlayerId != tracker.getPlayerId()) {
|
||||
PacketWrapper sneakPacket = PacketWrapper.create(0x0B, null, packetWrapper.user());
|
||||
sneakPacket.write(Type.VAR_INT, tracker.getPlayerId());
|
||||
sneakPacket.write(Type.VAR_INT, 0); //Start sneaking
|
||||
sneakPacket.write(Type.VAR_INT, 0); //Action Parameter
|
||||
|
||||
PacketWrapper unsneakPacket = PacketWrapper.create(0x0B, null, packetWrapper.user());
|
||||
unsneakPacket.write(Type.VAR_INT, tracker.getPlayerId());
|
||||
unsneakPacket.write(Type.VAR_INT, 1); //Stop sneaking
|
||||
unsneakPacket.write(Type.VAR_INT, 0); //Action Parameter
|
||||
|
||||
PacketUtil.sendToServer(sneakPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.UPDATE_SIGN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
int x = packetWrapper.read(Type.INT);
|
||||
int y = packetWrapper.read(Type.SHORT);
|
||||
int z = packetWrapper.read(Type.INT);
|
||||
packetWrapper.write(Type.POSITION1_8, new Position(x, y, z));
|
||||
for (int i = 0; i < 4; i++) {
|
||||
final String line = packetWrapper.read(Type.STRING);
|
||||
|
||||
packetWrapper.write(Type.COMPONENT, ComponentUtil.legacyToJson(line));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_ABILITIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BYTE);
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
handler(packetWrapper -> {
|
||||
PlayerSessionStorage playerSession = packetWrapper.user().get(PlayerSessionStorage.class);
|
||||
if (playerSession.allowFly) {
|
||||
byte flags = packetWrapper.get(Type.BYTE, 0);
|
||||
playerSession.flying = (flags & 2) == 2;
|
||||
}
|
||||
packetWrapper.set(Type.FLOAT, 0, playerSession.flySpeed);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.TAB_COMPLETE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
create(Type.OPTIONAL_POSITION1_8, null);
|
||||
handler(packetWrapper -> {
|
||||
String msg = packetWrapper.get(Type.STRING, 0);
|
||||
if (msg.toLowerCase().startsWith("/stp ")) {
|
||||
packetWrapper.cancel();
|
||||
String[] args = msg.split(" ");
|
||||
if (args.length <= 2) {
|
||||
String prefix = args.length == 1 ? "" : args[1];
|
||||
GameProfileStorage storage = packetWrapper.user().get(GameProfileStorage.class);
|
||||
List<GameProfileStorage.GameProfile> profiles = storage.getAllWithPrefix(prefix, true);
|
||||
|
||||
PacketWrapper tabComplete = PacketWrapper.create(0x3A, null, packetWrapper.user());
|
||||
tabComplete.write(Type.VAR_INT, profiles.size());
|
||||
for (GameProfileStorage.GameProfile profile : profiles) {
|
||||
tabComplete.write(Type.STRING, profile.name);
|
||||
}
|
||||
|
||||
PacketUtil.sendPacket(tabComplete, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Client Settings
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CLIENT_SETTINGS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.BOOLEAN);
|
||||
read(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
boolean cape = packetWrapper.read(Type.BOOLEAN);
|
||||
packetWrapper.write(Type.UNSIGNED_BYTE, (short) (cape ? 127 : 126));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLUGIN_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
read(Type.SHORT); // Length
|
||||
handler(packetWrapper -> {
|
||||
String channel = packetWrapper.get(Type.STRING, 0);
|
||||
|
||||
switch (channel) {
|
||||
case "MC|TrSel": {
|
||||
packetWrapper.passthrough(Type.INT);
|
||||
packetWrapper.read(Type.REMAINING_BYTES); // unused data ???
|
||||
break;
|
||||
}
|
||||
case "MC|ItemName": {
|
||||
byte[] data = packetWrapper.read(Type.REMAINING_BYTES);
|
||||
String name = new String(data, StandardCharsets.UTF_8);
|
||||
|
||||
packetWrapper.write(Type.STRING, name);
|
||||
|
||||
InventoryTracker windowTracker = packetWrapper.user().get(InventoryTracker.class);
|
||||
PacketWrapper updateCost = PacketWrapper.create(0x31, null, packetWrapper.user());
|
||||
updateCost.write(Type.UNSIGNED_BYTE, windowTracker.anvilId);
|
||||
updateCost.write(Type.SHORT, (short) 0);
|
||||
updateCost.write(Type.SHORT, windowTracker.levelCost);
|
||||
|
||||
PacketUtil.sendPacket(updateCost, Protocol1_7_6_10To1_8.class, true, true);
|
||||
break;
|
||||
}
|
||||
case "MC|BEdit":
|
||||
case "MC|BSign": {
|
||||
Item book = packetWrapper.read(Types1_7_6_10.COMPRESSED_NBT_ITEM);
|
||||
CompoundTag tag = book.tag();
|
||||
if (tag != null && tag.contains("pages")) {
|
||||
ListTag pages = tag.get("pages");
|
||||
for (int i = 0; i < pages.size(); i++) {
|
||||
StringTag page = pages.get(i);
|
||||
String value = page.getValue();
|
||||
value = ComponentUtil.legacyToJsonString(value);
|
||||
page.setValue(value);
|
||||
}
|
||||
}
|
||||
packetWrapper.write(Type.ITEM1_8, book);
|
||||
break;
|
||||
}
|
||||
case "MC|Brand": {
|
||||
packetWrapper.write(Type.STRING, new String(packetWrapper.read(Type.REMAINING_BYTES), StandardCharsets.UTF_8));
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
-256
@@ -1,256 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.Scoreboard;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public class ScoreboardPackets {
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SCOREBOARD_OBJECTIVE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
String name = packetWrapper.passthrough(Type.STRING);
|
||||
if (name.length() > 16) {
|
||||
packetWrapper.set(Type.STRING, 0, name = name.substring(0, 16));
|
||||
}
|
||||
byte mode = packetWrapper.read(Type.BYTE);
|
||||
|
||||
Scoreboard scoreboard = packetWrapper.user().get(Scoreboard.class);
|
||||
if (mode == 0) {
|
||||
if (scoreboard.objectiveExists(name)) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
scoreboard.addObjective(name);
|
||||
} else if (mode == 1) {
|
||||
if (!scoreboard.objectiveExists(name)) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
if (scoreboard.getColorIndependentSidebar() != null) {
|
||||
String username = packetWrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent()) {
|
||||
String sidebar = scoreboard.getColorDependentSidebar().get(color.get());
|
||||
if (name.equals(sidebar)) {
|
||||
PacketWrapper sidebarPacket = PacketWrapper.create(0x3D, null, packetWrapper.user());
|
||||
sidebarPacket.write(Type.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Type.STRING, scoreboard.getColorIndependentSidebar());
|
||||
PacketUtil.sendPacket(sidebarPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
scoreboard.removeObjective(name);
|
||||
} else if (mode == 2) {
|
||||
if (!scoreboard.objectiveExists(name)) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (mode == 0 || mode == 2) {
|
||||
String displayName = packetWrapper.passthrough(Type.STRING);
|
||||
if (displayName.length() > 32) {
|
||||
packetWrapper.set(Type.STRING, 1, displayName.substring(0, 32));
|
||||
}
|
||||
packetWrapper.read(Type.STRING);
|
||||
} else {
|
||||
packetWrapper.write(Type.STRING, "");
|
||||
}
|
||||
packetWrapper.write(Type.BYTE, mode);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_SCORE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING); // Name
|
||||
map(Type.VAR_INT, Type.BYTE); // Mode
|
||||
handler(packetWrapper -> {
|
||||
Scoreboard scoreboard = packetWrapper.user().get(Scoreboard.class);
|
||||
String name = packetWrapper.get(Type.STRING, 0);
|
||||
byte mode = packetWrapper.get(Type.BYTE, 0);
|
||||
|
||||
if (mode == 1) {
|
||||
name = scoreboard.removeTeamForScore(name);
|
||||
} else {
|
||||
name = scoreboard.sendTeamForScore(name);
|
||||
}
|
||||
|
||||
if (name.length() > 16) {
|
||||
name = ChatColorUtil.stripColor(name);
|
||||
if (name.length() > 16) {
|
||||
name = name.substring(0, 16);
|
||||
}
|
||||
}
|
||||
packetWrapper.set(Type.STRING, 0, name);
|
||||
|
||||
String objective = packetWrapper.read(Type.STRING);
|
||||
if (objective.length() > 16) {
|
||||
objective = objective.substring(0, 16);
|
||||
}
|
||||
|
||||
if (mode != 1) {
|
||||
int score = packetWrapper.read(Type.VAR_INT);
|
||||
packetWrapper.write(Type.STRING, objective);
|
||||
packetWrapper.write(Type.INT, score);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.DISPLAY_SCOREBOARD, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BYTE); // Position
|
||||
map(Type.STRING); // Score name
|
||||
handler(packetWrapper -> {
|
||||
byte position = packetWrapper.get(Type.BYTE, 0);
|
||||
String name = packetWrapper.get(Type.STRING, 0);
|
||||
Scoreboard scoreboard = packetWrapper.user().get(Scoreboard.class);
|
||||
if (position > 2) { // team specific sidebar
|
||||
byte receiverTeamColor = (byte) (position - 3);
|
||||
scoreboard.getColorDependentSidebar().put(receiverTeamColor, name);
|
||||
|
||||
String username = packetWrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent() && color.get() == receiverTeamColor) {
|
||||
position = 1;
|
||||
} else {
|
||||
position = -1;
|
||||
}
|
||||
} else if (position == 1) { // team independent sidebar
|
||||
scoreboard.setColorIndependentSidebar(name);
|
||||
String username = packetWrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent() && scoreboard.getColorDependentSidebar().containsKey(color.get())) {
|
||||
position = -1;
|
||||
}
|
||||
}
|
||||
if (position == -1) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
packetWrapper.set(Type.BYTE, 0, position);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.TEAMS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String team = packetWrapper.get(Type.STRING, 0);
|
||||
if (team == null) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
byte mode = packetWrapper.passthrough(Type.BYTE);
|
||||
|
||||
Scoreboard scoreboard = packetWrapper.user().get(Scoreboard.class);
|
||||
|
||||
if (mode != 0 && !scoreboard.teamExists(team)) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
} else if (mode == 0 && scoreboard.teamExists(team)) {
|
||||
scoreboard.removeTeam(team);
|
||||
|
||||
PacketWrapper remove = PacketWrapper.create(0x3E, null, packetWrapper.user());
|
||||
remove.write(Type.STRING, team);
|
||||
remove.write(Type.BYTE, (byte) 1);
|
||||
PacketUtil.sendPacket(remove, Protocol1_7_6_10To1_8.class, true, true);
|
||||
}
|
||||
|
||||
if (mode == 0) {
|
||||
scoreboard.addTeam(team);
|
||||
} else if (mode == 1) {
|
||||
scoreboard.removeTeam(team);
|
||||
}
|
||||
|
||||
if (mode == 0 || mode == 2) {
|
||||
packetWrapper.passthrough(Type.STRING); // Display name
|
||||
packetWrapper.passthrough(Type.STRING); // prefix
|
||||
packetWrapper.passthrough(Type.STRING); // suffix
|
||||
packetWrapper.passthrough(Type.BYTE); // friendly fire
|
||||
packetWrapper.read(Type.STRING); // name tag visibility
|
||||
byte color = packetWrapper.read(Type.BYTE);
|
||||
if (mode == 2 && scoreboard.getTeamColor(team).get() != color) {
|
||||
String username = packetWrapper.user().getProtocolInfo().getUsername();
|
||||
String sidebar = scoreboard.getColorDependentSidebar().get(color);
|
||||
PacketWrapper sidebarPacket = packetWrapper.create(0x3D);
|
||||
sidebarPacket.write(Type.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Type.STRING, sidebar == null ? "" : sidebar);
|
||||
PacketUtil.sendPacket(sidebarPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
scoreboard.setTeamColor(team, color);
|
||||
}
|
||||
if (mode == 0 || mode == 3 || mode == 4) {
|
||||
byte color = scoreboard.getTeamColor(team).get();
|
||||
String[] entries = packetWrapper.read(Type.STRING_ARRAY);
|
||||
List<String> entryList = new ArrayList<>();
|
||||
|
||||
for (String entry : entries) {
|
||||
String username = packetWrapper.user().getProtocolInfo().getUsername();
|
||||
|
||||
if (mode == 4) {
|
||||
if (!scoreboard.isPlayerInTeam(entry, team)) continue;
|
||||
scoreboard.removePlayerFromTeam(entry, team);
|
||||
if (entry.equals(username)) {
|
||||
PacketWrapper sidebarPacket = packetWrapper.create(0x3D);
|
||||
sidebarPacket.write(Type.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Type.STRING, scoreboard.getColorIndependentSidebar() == null ? "" : scoreboard.getColorIndependentSidebar());
|
||||
PacketUtil.sendPacket(sidebarPacket, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
} else {
|
||||
scoreboard.addPlayerToTeam(entry, team);
|
||||
if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
|
||||
PacketWrapper displayObjective = packetWrapper.create(0x3D);
|
||||
displayObjective.write(Type.BYTE, (byte) 1);
|
||||
displayObjective.write(Type.STRING, scoreboard.getColorDependentSidebar().get(color));
|
||||
PacketUtil.sendPacket(displayObjective, Protocol1_7_6_10To1_8.class);
|
||||
}
|
||||
}
|
||||
entryList.add(entry);
|
||||
}
|
||||
|
||||
packetWrapper.write(Type.SHORT, (short) entryList.size());
|
||||
for (String entry : entryList) {
|
||||
packetWrapper.write(Type.STRING, entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-314
@@ -1,314 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.VirtualHologramEntity;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.EntityTracker1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.api.rewriter.Replacement;
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class SpawnPackets {
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_PLAYER, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
handler(wrapper -> {
|
||||
final UUID uuid = wrapper.read(Type.UUID);
|
||||
wrapper.write(Type.STRING, uuid.toString()); // map to string
|
||||
|
||||
final GameProfileStorage gameProfileStorage = wrapper.user().get(GameProfileStorage.class);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) {
|
||||
wrapper.write(Type.STRING, ""); // name
|
||||
wrapper.write(Type.VAR_INT, 0); // properties count
|
||||
} else {
|
||||
wrapper.write(Type.STRING, gameProfile.name.length() > 16 ? gameProfile.name.substring(0, 16) : gameProfile.name); // name
|
||||
wrapper.write(Type.VAR_INT, gameProfile.properties.size()); // properties count
|
||||
|
||||
for (GameProfileStorage.Property property : gameProfile.properties) {
|
||||
wrapper.write(Type.STRING, property.name); // property name
|
||||
wrapper.write(Type.STRING, property.value); // property value
|
||||
wrapper.write(Type.STRING, property.signature == null ? "" : property.signature); // property signature
|
||||
}
|
||||
}
|
||||
|
||||
final int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
if (gameProfile != null && gameProfile.gamemode == 3) { // Spectator mode
|
||||
for (short i = 0; i < 5; i++) {
|
||||
final PacketWrapper entityEquipment = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_EQUIPMENT, wrapper.user());
|
||||
entityEquipment.write(Type.INT, entityId);
|
||||
entityEquipment.write(Type.SHORT, i);
|
||||
entityEquipment.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, i == 4 ? gameProfile.getSkull() : null);
|
||||
|
||||
entityEquipment.scheduleSend(Protocol1_7_6_10To1_8.class, true);
|
||||
}
|
||||
}
|
||||
|
||||
tracker.addPlayer(entityId, uuid);
|
||||
});
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
map(Type.SHORT); // item in hand id
|
||||
map(Types1_8.METADATA_LIST, Types1_7_6_10.METADATA_LIST); // metadata
|
||||
handler(wrapper -> {
|
||||
final List<Metadata> metadata = wrapper.get(Types1_7_6_10.METADATA_LIST, 0);
|
||||
protocol.getMetadataRewriter().transform(EntityTypes1_10.EntityType.PLAYER, metadata);
|
||||
|
||||
wrapper.set(Types1_7_6_10.METADATA_LIST, 0, metadata);
|
||||
});
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
tracker.addEntity(wrapper.get(Type.VAR_INT, 0), EntityTypes1_10.EntityType.PLAYER);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.BYTE); // type id
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.BYTE); // pitch
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.INT); // data
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
final EntityTypes1_10.EntityType type = EntityTypes1_10.getTypeFromId(wrapper.get(Type.BYTE, 0), true);
|
||||
final int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
|
||||
int x = wrapper.get(Type.INT, 0);
|
||||
int y = wrapper.get(Type.INT, 1);
|
||||
int z = wrapper.get(Type.INT, 2);
|
||||
|
||||
byte pitch = wrapper.get(Type.BYTE, 1);
|
||||
byte yaw = wrapper.get(Type.BYTE, 2);
|
||||
|
||||
int data = wrapper.get(Type.INT, 3);
|
||||
|
||||
if (type == EntityTypes1_10.ObjectType.ITEM_FRAME.getType()) {
|
||||
switch (yaw) {
|
||||
case -128:
|
||||
z += 32;
|
||||
yaw = 0;
|
||||
break;
|
||||
case -64:
|
||||
x -= 32;
|
||||
yaw = -64;
|
||||
break;
|
||||
case 0:
|
||||
z -= 32;
|
||||
yaw = -128;
|
||||
break;
|
||||
case 64:
|
||||
x += 32;
|
||||
yaw = 64;
|
||||
break;
|
||||
}
|
||||
} else if (type == EntityTypes1_10.ObjectType.ARMOR_STAND.getType()) {
|
||||
wrapper.cancel();
|
||||
final VirtualHologramEntity hologram = new VirtualHologramEntity(wrapper.user(), protocol.getMetadataRewriter(), entityId);
|
||||
hologram.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
hologram.setHeadYaw(yaw * 360f / 256);
|
||||
|
||||
tracker.trackHologram(entityId, hologram);
|
||||
}
|
||||
// TODO | Realign all entities
|
||||
|
||||
wrapper.set(Type.INT, 0, x);
|
||||
wrapper.set(Type.INT, 1, y);
|
||||
wrapper.set(Type.INT, 2, z);
|
||||
wrapper.set(Type.BYTE, 2, yaw);
|
||||
|
||||
tracker.addEntity(entityId, type);
|
||||
|
||||
if (type != null && type.isOrHasParent(EntityTypes1_10.EntityType.FALLING_BLOCK)) {
|
||||
int blockId = data & 0xFFF;
|
||||
int blockData = data >> 12 & 0xF;
|
||||
final Replacement replace = protocol.getItemRewriter().replace(blockId, blockData);
|
||||
if (replace != null) {
|
||||
blockId = replace.getId();
|
||||
blockData = replace.replaceData(blockData);
|
||||
}
|
||||
wrapper.set(Type.INT, 3, data = (blockId | blockData << 16));
|
||||
}
|
||||
|
||||
if (data > 0) {
|
||||
wrapper.passthrough(Type.SHORT); // velocity x
|
||||
wrapper.passthrough(Type.SHORT); // velocity y
|
||||
wrapper.passthrough(Type.SHORT); // velocity z
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_MOB, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.UNSIGNED_BYTE); // type id
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.BYTE); // yaw
|
||||
map(Type.BYTE); // pitch
|
||||
map(Type.BYTE); // head yaw
|
||||
map(Type.SHORT); // velocity x
|
||||
map(Type.SHORT); // velocity y
|
||||
map(Type.SHORT); // velocity z
|
||||
map(Types1_8.METADATA_LIST, Types1_7_6_10.METADATA_LIST); // metadata
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
final short typeId = wrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
if (typeId == 255 || typeId == -1) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
final EntityTypes1_10.EntityType type = EntityTypes1_10.getTypeFromId(typeId, false);
|
||||
final int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
|
||||
final int x = wrapper.get(Type.INT, 0);
|
||||
final int y = wrapper.get(Type.INT, 1);
|
||||
final int z = wrapper.get(Type.INT, 2);
|
||||
|
||||
final byte pitch = wrapper.get(Type.BYTE, 1);
|
||||
final byte yaw = wrapper.get(Type.BYTE, 0);
|
||||
final byte headYaw = wrapper.get(Type.BYTE, 2);
|
||||
|
||||
final List<Metadata> metadataList = wrapper.get(Types1_7_6_10.METADATA_LIST, 0);
|
||||
|
||||
if (type == EntityTypes1_10.EntityType.ARMOR_STAND) {
|
||||
final VirtualHologramEntity hologram = new VirtualHologramEntity(wrapper.user(), protocol.getMetadataRewriter(), entityId);
|
||||
|
||||
hologram.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
hologram.setHeadYaw(headYaw * 360f / 256);
|
||||
|
||||
tracker.trackHologram(entityId, hologram);
|
||||
tracker.updateMetadata(entityId, metadataList); // Track and remap hologram <-> zombie metadata
|
||||
wrapper.cancel();
|
||||
} else {
|
||||
protocol.getMetadataRewriter().transform(type, metadataList);
|
||||
|
||||
tracker.addEntity(entityId, type);
|
||||
if (tracker.isReplaced(type)) {
|
||||
final int newTypeId = tracker.replaceEntity(entityId, type);
|
||||
wrapper.set(Type.UNSIGNED_BYTE, 0, (short) newTypeId);
|
||||
|
||||
tracker.updateMetadata(entityId, metadataList);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_PAINTING, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.STRING); // title
|
||||
map(Type.POSITION1_8, Types1_7_6_10.INT_POSITION); // position
|
||||
map(Type.UNSIGNED_BYTE, Type.INT); // rotation
|
||||
handler(wrapper -> {
|
||||
final Position position = wrapper.get(Types1_7_6_10.INT_POSITION, 0);
|
||||
final int rotation = wrapper.get(Type.INT, 0);
|
||||
int modX = 0;
|
||||
int modZ = 0;
|
||||
switch (rotation) {
|
||||
case 0:
|
||||
modZ = -1;
|
||||
break;
|
||||
case 1:
|
||||
modX = 1;
|
||||
break;
|
||||
case 2:
|
||||
modZ = 1;
|
||||
break;
|
||||
case 3:
|
||||
modX = -1;
|
||||
break;
|
||||
}
|
||||
wrapper.set(Types1_7_6_10.INT_POSITION, 0, new Position(position.x() + modX, position.y(), position.z() + modZ));
|
||||
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
tracker.addEntity(wrapper.get(Type.VAR_INT, 0), EntityTypes1_10.EntityType.PAINTING);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_EXPERIENCE_ORB, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
map(Type.SHORT); // count
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
tracker.addEntity(wrapper.get(Type.VAR_INT, 0), EntityTypes1_10.EntityType.EXPERIENCE_ORB);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_GLOBAL_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.BYTE); // type id
|
||||
map(Type.INT); // x
|
||||
map(Type.INT); // y
|
||||
map(Type.INT); // z
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
|
||||
|
||||
tracker.addEntity(wrapper.get(Type.VAR_INT, 0), EntityTypes1_10.EntityType.LIGHTNING);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-305
@@ -1,305 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.WorldBorderEmulator;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.chunk.ChunkType1_7_6;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.chunk.BulkChunkType1_7_6;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.rewriter.ParticleIndex1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.FixedByteArrayType;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.BulkChunkType1_8;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
|
||||
public class WorldPackets {
|
||||
|
||||
private static void rewriteBlockIds(final Protocol1_7_6_10To1_8 protocol, final Chunk chunk) {
|
||||
for (ChunkSection section : chunk.getSections()) {
|
||||
if (section == null) continue;
|
||||
final DataPalette palette = section.palette(PaletteType.BLOCKS);
|
||||
|
||||
for (int i = 0; i < palette.size(); i++) {
|
||||
palette.setIdByIndex(i, protocol.getItemRewriter().replace(palette.idByIndex(i)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void register(Protocol1_7_6_10To1_8 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CHUNK_DATA, wrapper -> {
|
||||
final ClientWorld world = wrapper.user().get(ClientWorld.class);
|
||||
final Chunk chunk = wrapper.read(ChunkType1_8.forEnvironment(world.getEnvironment()));
|
||||
rewriteBlockIds(protocol, chunk);
|
||||
|
||||
wrapper.write(ChunkType1_7_6.TYPE, chunk);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MULTI_BLOCK_CHANGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT); // chunk x
|
||||
map(Type.INT); // chunk z
|
||||
|
||||
handler(wrapper -> {
|
||||
final BlockChangeRecord[] records = wrapper.read(Type.BLOCK_CHANGE_RECORD_ARRAY);
|
||||
|
||||
wrapper.write(Type.SHORT, (short) records.length); // record count
|
||||
wrapper.write(Type.INT, records.length * 4); // data array length (position + block id)
|
||||
|
||||
for (BlockChangeRecord record : records) {
|
||||
wrapper.write(Type.SHORT, (short) (record.getSectionX() << 12 | record.getSectionZ() << 8 | record.getY())); // position
|
||||
wrapper.write(Type.SHORT, (short) protocol.getItemRewriter().replace(record.getBlockId())); // block id
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_CHANGE, new PacketHandlers() {
|
||||
@Override
|
||||
protected void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.U_BYTE_POSITION); // position
|
||||
handler(wrapper -> {
|
||||
int data = wrapper.read(Type.VAR_INT); // block data
|
||||
data = protocol.getItemRewriter().replace(data);
|
||||
|
||||
wrapper.write(Type.VAR_INT, data >> 4); // block id
|
||||
wrapper.write(Type.UNSIGNED_BYTE, (short) (data & 0xF)); // block data
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.SHORT_POSITION); // position
|
||||
map(Type.UNSIGNED_BYTE); // type
|
||||
map(Type.UNSIGNED_BYTE); // data
|
||||
map(Type.VAR_INT); // block id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_BREAK_ANIMATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT); // entity id
|
||||
map(Type.POSITION1_8, Types1_7_6_10.INT_POSITION); // position
|
||||
map(Type.BYTE); // progress
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MAP_BULK_CHUNK, wrapper -> {
|
||||
final Chunk[] chunks = wrapper.read(BulkChunkType1_8.TYPE);
|
||||
for (Chunk chunk : chunks) {
|
||||
rewriteBlockIds(protocol, chunk);
|
||||
}
|
||||
|
||||
wrapper.write(BulkChunkType1_7_6.TYPE, chunks);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT); // effect id
|
||||
map(Type.POSITION1_8, Types1_7_6_10.BYTE_POSITION); // position
|
||||
map(Type.INT); // data
|
||||
map(Type.BOOLEAN); // disable relative volume
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SPAWN_PARTICLE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(wrapper -> {
|
||||
final int particleId = wrapper.read(Type.INT); // particle id
|
||||
ParticleIndex1_7_6_10 particle = ParticleIndex1_7_6_10.find(particleId);
|
||||
if (particle == null) particle = ParticleIndex1_7_6_10.CRIT;
|
||||
wrapper.write(Type.STRING, particle.name); // particle name
|
||||
|
||||
});
|
||||
read(Type.BOOLEAN); // long distance
|
||||
map(Type.FLOAT); // x
|
||||
map(Type.FLOAT); // y
|
||||
map(Type.FLOAT); // z
|
||||
map(Type.FLOAT); // offset x
|
||||
map(Type.FLOAT); // offset y
|
||||
map(Type.FLOAT); // offset z
|
||||
map(Type.FLOAT); // particle data
|
||||
map(Type.INT); // particle count
|
||||
handler(wrapper -> {
|
||||
String name = wrapper.get(Type.STRING, 0);
|
||||
ParticleIndex1_7_6_10 particle = ParticleIndex1_7_6_10.find(name);
|
||||
|
||||
if (particle == ParticleIndex1_7_6_10.ICON_CRACK || particle == ParticleIndex1_7_6_10.BLOCK_CRACK || particle == ParticleIndex1_7_6_10.BLOCK_DUST) {
|
||||
int id = wrapper.read(Type.VAR_INT);
|
||||
int data = particle == ParticleIndex1_7_6_10.ICON_CRACK ? wrapper.read(Type.VAR_INT) : id / 4096;
|
||||
id %= 4096;
|
||||
if (id >= 256 && id <= 422 || id >= 2256 && id <= 2267) { //item
|
||||
particle = ParticleIndex1_7_6_10.ICON_CRACK;
|
||||
} else if (id >= 0 && id <= 164 || id >= 170 && id <= 175) {
|
||||
if (particle == ParticleIndex1_7_6_10.ICON_CRACK)
|
||||
particle = ParticleIndex1_7_6_10.BLOCK_CRACK;
|
||||
} else {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
name = particle.name + "_" + id + "_" + data;
|
||||
}
|
||||
|
||||
wrapper.set(Type.STRING, 0, name);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_SIGN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.SHORT_POSITION); // position
|
||||
handler(wrapper -> {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
String line = wrapper.read(Type.STRING);
|
||||
line = ChatUtil.jsonToLegacy(line);
|
||||
line = ChatUtil.removeUnusedColor(line, '0');
|
||||
|
||||
if (line.length() > 15) {
|
||||
line = ChatColorUtil.stripColor(line);
|
||||
if (line.length() > 15) line = line.substring(0, 15);
|
||||
}
|
||||
wrapper.write(Type.STRING, line);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MAP_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(wrapper -> {
|
||||
wrapper.cancel();
|
||||
final int id = wrapper.read(Type.VAR_INT);
|
||||
final byte scale = wrapper.read(Type.BYTE);
|
||||
|
||||
final int iconCount = wrapper.read(Type.VAR_INT);
|
||||
byte[] icons = new byte[iconCount * 4];
|
||||
for (int i = 0; i < iconCount; i++) {
|
||||
final int directionAndType = wrapper.read(Type.BYTE);
|
||||
|
||||
icons[i * 4] = (byte) (directionAndType >> 4 & 0xF);
|
||||
icons[i * 4 + 1] = wrapper.read(Type.BYTE); // x
|
||||
icons[i * 4 + 2] = wrapper.read(Type.BYTE); // z
|
||||
icons[i * 4 + 3] = (byte) (directionAndType & 0xF);
|
||||
}
|
||||
final short columns = wrapper.read(Type.UNSIGNED_BYTE);
|
||||
if (columns > 0) {
|
||||
final short rows = wrapper.read(Type.UNSIGNED_BYTE);
|
||||
final short x = wrapper.read(Type.UNSIGNED_BYTE);
|
||||
final short z = wrapper.read(Type.UNSIGNED_BYTE);
|
||||
|
||||
final byte[] data = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
|
||||
for (int column = 0; column < columns; column++) {
|
||||
byte[] columnData = new byte[rows + 3];
|
||||
columnData[0] = 0;
|
||||
columnData[1] = (byte) (x + column);
|
||||
columnData[2] = (byte) z;
|
||||
|
||||
for (int i = 0; i < rows; i++) {
|
||||
columnData[i + 3] = data[column + i * columns];
|
||||
}
|
||||
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_DATA, wrapper.user());
|
||||
mapData.write(Type.VAR_INT, id); // map id
|
||||
mapData.write(Type.SHORT, (short) columnData.length); // data length
|
||||
mapData.write(new FixedByteArrayType(columnData.length), columnData); // data
|
||||
|
||||
mapData.send(Protocol1_7_6_10To1_8.class, true);
|
||||
}
|
||||
}
|
||||
|
||||
if (iconCount > 0) {
|
||||
final byte[] iconData = new byte[iconCount * 3 + 1];
|
||||
iconData[0] = 1;
|
||||
for (int i = 0; i < iconCount; i++) {
|
||||
iconData[i * 3 + 1] = (byte) (icons[i * 4] << 4 | icons[i * 4 + 3] & 0xF);
|
||||
iconData[i * 3 + 2] = icons[i * 4 + 1];
|
||||
iconData[i * 3 + 3] = icons[i * 4 + 2];
|
||||
}
|
||||
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_DATA, wrapper.user());
|
||||
mapData.write(Type.VAR_INT, id); // map id
|
||||
mapData.write(Type.SHORT, (short) iconData.length); // data length
|
||||
mapData.write(new FixedByteArrayType(iconData.length), iconData); // data
|
||||
|
||||
mapData.send(Protocol1_7_6_10To1_8.class, true);
|
||||
}
|
||||
|
||||
// Update scale
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_DATA, wrapper.user());
|
||||
mapData.write(Type.VAR_INT, id); // map id
|
||||
mapData.write(Type.SHORT, (short) 2); // data length
|
||||
mapData.write(new FixedByteArrayType(2), new byte[]{2, scale}); // data
|
||||
|
||||
mapData.send(Protocol1_7_6_10To1_8.class, true);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_ENTITY_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8, Types1_7_6_10.SHORT_POSITION); // position
|
||||
map(Type.UNSIGNED_BYTE); // action
|
||||
map(Type.NAMED_COMPOUND_TAG, Types1_7_6_10.COMPRESSED_NBT); // nbt
|
||||
}
|
||||
});
|
||||
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.SERVER_DIFFICULTY);
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.COMBAT_EVENT);
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.WORLD_BORDER, null, wrapper -> {
|
||||
final WorldBorderEmulator emulator = wrapper.user().get(WorldBorderEmulator.class);
|
||||
wrapper.cancel();
|
||||
|
||||
final int action = wrapper.read(Type.VAR_INT);
|
||||
if (action == 0) { // set size
|
||||
emulator.setSize(wrapper.read(Type.DOUBLE)); // radius
|
||||
} else if (action == 1) { // lerp size
|
||||
emulator.lerpSize(wrapper.read(Type.DOUBLE), wrapper.read(Type.DOUBLE), wrapper.read(Type.VAR_LONG)); // old radius, new radius, speed
|
||||
} else if (action == 2) { // set center
|
||||
emulator.setCenter(wrapper.read(Type.DOUBLE), wrapper.read(Type.DOUBLE)); // x, z
|
||||
} else if (action == 3) { // initialize
|
||||
emulator.init(
|
||||
wrapper.read(Type.DOUBLE), wrapper.read(Type.DOUBLE), // x, z
|
||||
wrapper.read(Type.DOUBLE), wrapper.read(Type.DOUBLE), // old radius, new radius
|
||||
wrapper.read(Type.VAR_LONG) // speed
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-230
@@ -1,230 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.api.rewriter.ReplacementItemRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.api.rewriter.Replacement;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viarewind.utils.Enchantments;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ReplacementItemRewriter1_7_6_10 extends ReplacementItemRewriter<Protocol1_7_6_10To1_8> {
|
||||
private final static String VIA_REWIND_TAG_KEY = "ViaRewind1_7_6_10to1_8";
|
||||
|
||||
public ReplacementItemRewriter1_7_6_10(Protocol1_7_6_10To1_8 protocol) {
|
||||
super(protocol, ProtocolVersion.v1_8);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register() {
|
||||
registerBlock(176, new Replacement(63));
|
||||
registerBlock(177, new Replacement(68));
|
||||
registerBlock(193, new Replacement(64));
|
||||
registerBlock(194, new Replacement(64));
|
||||
registerBlock(195, new Replacement(64));
|
||||
registerBlock(196, new Replacement(64));
|
||||
registerBlock(197, new Replacement(64));
|
||||
registerBlock(77, 5, new Replacement(69, 6));
|
||||
registerBlock(77, 13, new Replacement(69, 14));
|
||||
registerBlock(77, 0, new Replacement(69, 0));
|
||||
registerBlock(77, 8, new Replacement(69, 8));
|
||||
registerBlock(143, 5, new Replacement(69, 6));
|
||||
registerBlock(143, 13, new Replacement(69, 14));
|
||||
registerBlock(143, 0, new Replacement(69, 0));
|
||||
registerBlock(143, 8, new Replacement(69, 8));
|
||||
registerBlock(178, new Replacement(151));
|
||||
registerBlock(182, 0, new Replacement(44, 1));
|
||||
registerBlock(182, 8, new Replacement(44, 9));
|
||||
|
||||
registerItem(425, new Replacement(323, "Banner"));
|
||||
registerItem(409, new Replacement(406, "Prismarine Shard"));
|
||||
registerItem(410, new Replacement(406, "Prismarine Crystal"));
|
||||
registerItem(416, new Replacement(280, "Armor Stand"));
|
||||
registerItem(423, new Replacement(363, "Raw Mutton"));
|
||||
registerItem(424, new Replacement(364, "Cooked Mutton"));
|
||||
registerItem(411, new Replacement(365, "Raw Rabbit"));
|
||||
registerItem(412, new Replacement(366, "Cooked Rabbit"));
|
||||
registerItem(413, new Replacement(282, "Rabbit Stew"));
|
||||
registerItem(414, new Replacement(375, "Rabbit's Foot"));
|
||||
registerItem(415, new Replacement(334, "Rabbit Hide"));
|
||||
registerItem(373, 8203, new Replacement(373, 0, "Potion of Leaping"));
|
||||
registerItem(373, 8235, new Replacement(373, 0, "Potion of Leaping"));
|
||||
registerItem(373, 8267, new Replacement(373, 0, "Potion of Leaping"));
|
||||
registerItem(373, 16395, new Replacement(373, 0, "Splash Potion of Leaping"));
|
||||
registerItem(373, 16427, new Replacement(373, 0, "Splash Potion of Leaping"));
|
||||
registerItem(373, 16459, new Replacement(373, 0, "Splash Potion of Leaping"));
|
||||
registerItem(383, 30, new Replacement(383, "Spawn ArmorStand"));
|
||||
registerItem(383, 67, new Replacement(383, "Spawn Endermite"));
|
||||
registerItem(383, 68, new Replacement(383, "Spawn Guardian"));
|
||||
registerItem(383, 101, new Replacement(383, "Spawn Rabbit"));
|
||||
registerItem(19, 1, new Replacement(19, 0, "Wet Sponge"));
|
||||
registerItem(182, new Replacement(44, 1, "Red Sandstone Slab"));
|
||||
|
||||
registerItemBlock(166, new Replacement(20, "Barrier"));
|
||||
registerItemBlock(167, new Replacement(96, "Iron Trapdoor"));
|
||||
registerItemBlock(1, 1, new Replacement(1, 0, "Granite"));
|
||||
registerItemBlock(1, 2, new Replacement(1, 0, "Polished Granite"));
|
||||
registerItemBlock(1, 3, new Replacement(1, 0, "Diorite"));
|
||||
registerItemBlock(1, 4, new Replacement(1, 0, "Polished Diorite"));
|
||||
registerItemBlock(1, 5, new Replacement(1, 0, "Andesite"));
|
||||
registerItemBlock(1, 6, new Replacement(1, 0, "Polished Andesite"));
|
||||
registerItemBlock(168, 0, new Replacement(1, 0, "Prismarine"));
|
||||
registerItemBlock(168, 1, new Replacement(98, 0, "Prismarine Bricks"));
|
||||
registerItemBlock(168, 2, new Replacement(98, 1, "Dark Prismarine"));
|
||||
registerItemBlock(169, new Replacement(89, "Sea Lantern"));
|
||||
registerItemBlock(165, new Replacement(95, 5, "Slime Block"));
|
||||
registerItemBlock(179, 0, new Replacement(24, "Red Sandstone"));
|
||||
registerItemBlock(179, 1, new Replacement(24, "Chiseled Red Sandstone"));
|
||||
registerItemBlock(179, 2, new Replacement(24, "Smooth Sandstone"));
|
||||
registerItemBlock(181, new Replacement(43, 1, "Double Red Sandstone Slab"));
|
||||
registerItemBlock(180, new Replacement(128, "Red Sandstone Stairs"));
|
||||
registerItemBlock(188, new Replacement(85, "Spruce Fence"));
|
||||
registerItemBlock(189, new Replacement(85, "Birch Fence"));
|
||||
registerItemBlock(190, new Replacement(85, "Jungle Fence"));
|
||||
registerItemBlock(191, new Replacement(85, "Dark Oak Fence"));
|
||||
registerItemBlock(192, new Replacement(85, "Acacia Fence"));
|
||||
registerItemBlock(183, new Replacement(107, "Spruce Fence Gate"));
|
||||
registerItemBlock(184, new Replacement(107, "Birch Fence Gate"));
|
||||
registerItemBlock(185, new Replacement(107, "Jungle Fence Gate"));
|
||||
registerItemBlock(186, new Replacement(107, "Dark Oak Fence Gate"));
|
||||
registerItemBlock(187, new Replacement(107, "Acacia Fence Gate"));
|
||||
registerItemBlock(427, new Replacement(324, "Spruce Door"));
|
||||
registerItemBlock(428, new Replacement(324, "Birch Door"));
|
||||
registerItemBlock(429, new Replacement(324, "Jungle Door"));
|
||||
registerItemBlock(430, new Replacement(324, "Dark Oak Door"));
|
||||
registerItemBlock(431, new Replacement(324, "Acacia Door"));
|
||||
registerItemBlock(157, new Replacement(28, "Activator Rail"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToClient(Item item) {
|
||||
if (item == null) return null;
|
||||
|
||||
CompoundTag tag = item.tag();
|
||||
if (tag == null) {
|
||||
item.setTag(tag = new CompoundTag());
|
||||
}
|
||||
|
||||
CompoundTag viaRewindTag = new CompoundTag();
|
||||
tag.put(VIA_REWIND_TAG_KEY, viaRewindTag);
|
||||
|
||||
viaRewindTag.put("id", new ShortTag((short) item.identifier()));
|
||||
viaRewindTag.put("data", new ShortTag(item.data()));
|
||||
|
||||
CompoundTag display = tag.get("display");
|
||||
if (display != null && display.contains("Name")) {
|
||||
viaRewindTag.put("displayName", new StringTag((String) display.get("Name").getValue()));
|
||||
}
|
||||
|
||||
if (display != null && display.contains("Lore")) {
|
||||
viaRewindTag.put("lore", new ListTag(((ListTag) display.get("Lore")).getValue()));
|
||||
}
|
||||
|
||||
if (tag.contains("ench") || tag.contains("StoredEnchantments")) {
|
||||
ListTag enchTag = tag.contains("ench") ? tag.get("ench") : tag.get("StoredEnchantments");
|
||||
List<Tag> lore = new ArrayList<>();
|
||||
for (Tag ench : new ArrayList<>(enchTag.getValue())) {
|
||||
short id = ((NumberTag) ((CompoundTag) ench).get("id")).asShort();
|
||||
short lvl = ((NumberTag) ((CompoundTag) ench).get("lvl")).asShort();
|
||||
String s;
|
||||
if (id == 8) {
|
||||
s = "§r§7Depth Strider ";
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
enchTag.remove(ench);
|
||||
s += Enchantments.ENCHANTMENTS.getOrDefault(lvl, "enchantment.level." + lvl);
|
||||
lore.add(new StringTag(s));
|
||||
}
|
||||
if (!lore.isEmpty()) {
|
||||
if (display == null) {
|
||||
tag.put("display", display = new CompoundTag());
|
||||
viaRewindTag.put("noDisplay", new ByteTag());
|
||||
}
|
||||
ListTag loreTag = display.get("Lore");
|
||||
if (loreTag == null) display.put("Lore", loreTag = new ListTag(StringTag.class));
|
||||
lore.addAll(loreTag.getValue());
|
||||
loreTag.setValue(lore);
|
||||
}
|
||||
}
|
||||
|
||||
if (item.identifier() == 387 && tag.contains("pages")) {
|
||||
ListTag pages = tag.get("pages");
|
||||
ListTag oldPages = new ListTag(StringTag.class);
|
||||
viaRewindTag.put("pages", oldPages);
|
||||
|
||||
for (int i = 0; i < pages.size(); i++) {
|
||||
StringTag page = pages.get(i);
|
||||
String value = page.getValue();
|
||||
oldPages.add(new StringTag(value));
|
||||
value = ChatUtil.jsonToLegacy(value);
|
||||
page.setValue(value);
|
||||
}
|
||||
}
|
||||
|
||||
replace(item);
|
||||
|
||||
if (viaRewindTag.size() == 2 && (short) viaRewindTag.get("id").getValue() == item.identifier() && (short) viaRewindTag.get("data").getValue() == item.data()) {
|
||||
item.tag().remove(VIA_REWIND_TAG_KEY);
|
||||
if (item.tag().isEmpty()) item.setTag(null);
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToServer(Item item) {
|
||||
if (item == null) return null;
|
||||
|
||||
CompoundTag tag = item.tag();
|
||||
|
||||
if (tag == null || !item.tag().contains(VIA_REWIND_TAG_KEY)) return item;
|
||||
|
||||
CompoundTag viaVersionTag = tag.remove(VIA_REWIND_TAG_KEY);
|
||||
|
||||
item.setIdentifier((short) viaVersionTag.get("id").getValue());
|
||||
item.setData((Short) viaVersionTag.get("data").getValue());
|
||||
|
||||
if (viaVersionTag.contains("noDisplay")) tag.remove("display");
|
||||
|
||||
if (viaVersionTag.contains("displayName")) {
|
||||
CompoundTag display = tag.get("display");
|
||||
if (display == null) tag.put("display", display = new CompoundTag());
|
||||
StringTag name = display.get("Name");
|
||||
if (name == null) display.put("Name", new StringTag((String) viaVersionTag.get("displayName").getValue()));
|
||||
else name.setValue((String) viaVersionTag.get("displayName").getValue());
|
||||
} else if (tag.contains("display")) {
|
||||
((CompoundTag) tag.get("display")).remove("Name");
|
||||
}
|
||||
|
||||
if (item.identifier() == 387) {
|
||||
ListTag oldPages = viaVersionTag.get("pages");
|
||||
tag.remove("pages");
|
||||
tag.put("pages", oldPages);
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
}
|
||||
-193
@@ -1,193 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.api.rewriter.ReplacementEntityTracker;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.VirtualHologramEntity;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetadataRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class EntityTracker1_7_6_10 extends ReplacementEntityTracker {
|
||||
|
||||
protected final MetadataRewriter metadataRewriter;
|
||||
|
||||
private final Map<Integer, Integer> vehicleMap = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, VirtualHologramEntity> virtualHologramMap = new HashMap<>();
|
||||
|
||||
private final Map<Integer, UUID> playersByEntityId = new HashMap<>();
|
||||
private final Map<UUID, Integer> playersByUniqueId = new HashMap<>();
|
||||
|
||||
public int spectatingPlayerId = -1;
|
||||
|
||||
public EntityTracker1_7_6_10(UserConnection user, final MetadataRewriter metadataRewriter) {
|
||||
super(user, ProtocolVersion.v1_8, MetaType1_7_6_10.Byte, MetaType1_7_6_10.String);
|
||||
this.metadataRewriter = metadataRewriter;
|
||||
|
||||
registerEntity(EntityTypes1_10.EntityType.GUARDIAN, EntityTypes1_10.EntityType.SQUID, "Guardian");
|
||||
registerEntity(EntityTypes1_10.EntityType.ENDERMITE, EntityTypes1_10.EntityType.SQUID, "Endermite");
|
||||
registerEntity(EntityTypes1_10.EntityType.RABBIT, EntityTypes1_10.EntityType.CHICKEN, "Rabbit");
|
||||
}
|
||||
|
||||
public void trackHologram(final int entityId, final VirtualHologramEntity hologram) {
|
||||
addEntity(entityId, EntityTypes1_10.EntityType.ARMOR_STAND);
|
||||
getEntityReplacementMap().put(entityId, EntityTypes1_10.EntityType.ARMOR_STAND);
|
||||
|
||||
virtualHologramMap.put(entityId, hologram);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMetadata(int entityId, List<Metadata> metadata) throws Exception {
|
||||
if (virtualHologramMap.containsKey(entityId)) {
|
||||
virtualHologramMap.get(entityId).updateMetadata(metadata);
|
||||
return;
|
||||
}
|
||||
|
||||
super.updateMetadata(entityId, metadata);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeEntity(int entityId) {
|
||||
super.removeEntity(entityId);
|
||||
|
||||
if (playersByEntityId.containsKey(entityId)) {
|
||||
final UUID playerId = playersByEntityId.remove(entityId);
|
||||
|
||||
playersByUniqueId.remove(playerId);
|
||||
getUser().get(PlayerSessionStorage.class).getPlayerEquipment().remove(playerId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
super.clear();
|
||||
|
||||
vehicleMap.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientEntityId(int entityId) {
|
||||
if (this.spectatingPlayerId == this.getPlayerId()) {
|
||||
this.spectatingPlayerId = entityId;
|
||||
}
|
||||
super.setClientEntityId(entityId);
|
||||
}
|
||||
|
||||
public void addPlayer(final Integer entityId, final UUID uuid) {
|
||||
playersByUniqueId.put(uuid, entityId);
|
||||
playersByEntityId.put(entityId, uuid);
|
||||
}
|
||||
|
||||
public UUID getPlayerUUID(final int entityId) {
|
||||
return playersByEntityId.get(entityId);
|
||||
}
|
||||
|
||||
public int getPlayerEntityId(final UUID uuid) {
|
||||
return playersByUniqueId.getOrDefault(uuid, -1);
|
||||
}
|
||||
|
||||
public int getVehicle(final int passengerId) {
|
||||
for (Map.Entry<Integer, Integer> vehicle : vehicleMap.entrySet()) {
|
||||
if (vehicle.getValue() == passengerId) {
|
||||
return vehicle.getValue();
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
public int getPassenger(int vehicleId) {
|
||||
return vehicleMap.getOrDefault(vehicleId, -1);
|
||||
}
|
||||
|
||||
protected void startSneaking() {
|
||||
try {
|
||||
final PacketWrapper entityAction = PacketWrapper.create(ServerboundPackets1_7_2_5.ENTITY_ACTION, getUser());
|
||||
entityAction.write(Type.VAR_INT, this.getPlayerId()); // entity id
|
||||
entityAction.write(Type.VAR_INT, 0); // action id, start sneaking
|
||||
entityAction.write(Type.VAR_INT, 0); // jump boost
|
||||
|
||||
entityAction.sendToServer(Protocol1_7_6_10To1_8.class, true);
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.SEVERE, "Failed to send sneak packet", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setPassenger(int vehicleId, int passengerId) {
|
||||
if (vehicleId == this.spectatingPlayerId && this.spectatingPlayerId != this.getPlayerId()) {
|
||||
startSneaking();
|
||||
setSpectating(this.getPlayerId());
|
||||
}
|
||||
|
||||
if (vehicleId == -1) {
|
||||
vehicleMap.remove(getVehicle(passengerId));
|
||||
} else if (passengerId == -1) {
|
||||
vehicleMap.remove(vehicleId);
|
||||
} else {
|
||||
vehicleMap.put(vehicleId, passengerId);
|
||||
}
|
||||
}
|
||||
|
||||
protected void attachEntity(final int target) {
|
||||
try {
|
||||
final PacketWrapper attachEntity = PacketWrapper.create(ClientboundPackets1_8.ATTACH_ENTITY, getUser());
|
||||
attachEntity.write(Type.INT, this.getPlayerId()); // vehicle id
|
||||
attachEntity.write(Type.INT, target); // passenger id
|
||||
attachEntity.write(Type.BOOLEAN, false); // leash
|
||||
|
||||
attachEntity.scheduleSend(Protocol1_7_6_10To1_8.class, true);
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.SEVERE, "Failed to send attach packet", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setSpectating(int spectating) {
|
||||
if (spectating != this.getPlayerId() && getPassenger(spectating) != -1) {
|
||||
startSneaking();
|
||||
setSpectating(this.getPlayerId());
|
||||
return;
|
||||
}
|
||||
if (this.spectatingPlayerId != spectating && this.spectatingPlayerId != this.getPlayerId()) {
|
||||
attachEntity(-1);
|
||||
}
|
||||
this.spectatingPlayerId = spectating;
|
||||
if (spectating != this.getPlayerId()) {
|
||||
attachEntity(this.spectatingPlayerId);
|
||||
}
|
||||
}
|
||||
|
||||
public Map<Integer, VirtualHologramEntity> getVirtualHologramMap() {
|
||||
return virtualHologramMap;
|
||||
}
|
||||
}
|
||||
-56
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item.NBTType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item.ItemArrayType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item.ItemType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetadataListType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetadataType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.primitive.ByteIntArrayType;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.primitive.PositionUYType;
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Types1_7_6_10 {
|
||||
|
||||
// Primitives
|
||||
public final static Type<int[]> BYTE_INT_ARRAY = new ByteIntArrayType(); // Integer array with byte as length indicator
|
||||
|
||||
// Positions /shrug
|
||||
public final static Type<Position> SHORT_POSITION = new PositionUYType<>(Type.SHORT, value -> (short) value);
|
||||
public final static Type<Position> INT_POSITION = new PositionUYType<>(Type.INT, value -> value);
|
||||
public final static Type<Position> BYTE_POSITION = new PositionUYType<>(Type.BYTE, value -> (byte) value);
|
||||
public final static Type<Position> U_BYTE_POSITION = new PositionUYType<>(Type.UNSIGNED_BYTE, value -> (short) value);
|
||||
|
||||
// Items
|
||||
public final static Type<CompoundTag> COMPRESSED_NBT = new NBTType();
|
||||
public final static Type<Item> COMPRESSED_NBT_ITEM = new ItemType();
|
||||
public final static Type<Item[]> COMPRESSED_NBT_ITEM_ARRAY = new ItemArrayType();
|
||||
|
||||
// Metadata
|
||||
public final static Type<Metadata> METADATA = new MetadataType();
|
||||
public final static Type<List<Metadata>> METADATA_LIST = new MetadataListType();
|
||||
|
||||
}
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.type.types.metadata.MetaListTypeTemplate;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class MetadataListType extends MetaListTypeTemplate {
|
||||
@Override
|
||||
public List<Metadata> read(ByteBuf buffer) throws Exception {
|
||||
ArrayList<Metadata> list = new ArrayList<>();
|
||||
|
||||
Metadata m;
|
||||
do {
|
||||
m = Types1_7_6_10.METADATA.read(buffer);
|
||||
if (m != null) {
|
||||
list.add(m);
|
||||
}
|
||||
} while (m != null);
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, List<Metadata> metadata) throws Exception {
|
||||
for (Metadata meta : metadata) {
|
||||
Types1_7_6_10.METADATA.write(buffer, meta);
|
||||
}
|
||||
if (metadata.isEmpty()) {
|
||||
Types1_7_6_10.METADATA.write(buffer, new Metadata(0, MetaType1_7_6_10.Byte, (byte) 0));
|
||||
}
|
||||
buffer.writeByte(127);
|
||||
}
|
||||
}
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.primitive;
|
||||
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.function.IntFunction;
|
||||
|
||||
public class PositionUYType<T extends Number> extends Type<Position> {
|
||||
|
||||
private final Type<T> yType;
|
||||
private final IntFunction<T> toY;
|
||||
|
||||
public PositionUYType(final Type<T> yType, final IntFunction<T> toY) {
|
||||
super(Position.class);
|
||||
|
||||
this.yType = yType;
|
||||
this.toY = toY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Position read(ByteBuf buffer) throws Exception {
|
||||
final int x = buffer.readInt();
|
||||
final int y = yType.read(buffer).intValue();
|
||||
final int z = buffer.readInt();
|
||||
|
||||
return new Position(x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ByteBuf buffer, Position value) throws Exception {
|
||||
buffer.writeInt(value.x());
|
||||
yType.write(buffer, this.toY.apply(value.y()));
|
||||
buffer.writeInt(value.z());
|
||||
}
|
||||
}
|
||||
-113
@@ -1,113 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9;
|
||||
|
||||
import com.viaversion.viarewind.api.rewriter.ReplacementItemRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.metadata.MetadataRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.rewriter.ReplacementItemRewriter1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.packets.*;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.*;
|
||||
import com.viaversion.viarewind.utils.Ticker;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Queue;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
public class Protocol1_8To1_9 extends AbstractProtocol<ClientboundPackets1_9, ClientboundPackets1_8, ServerboundPackets1_9, ServerboundPackets1_8> {
|
||||
private final ReplacementItemRewriter<Protocol1_8To1_9> itemRewriter = new ReplacementItemRewriter1_8(this);
|
||||
private final MetadataRewriter metadataRewriter = new MetadataRewriter(this);
|
||||
|
||||
public Queue<PacketWrapper> animationsToSend = new ConcurrentLinkedQueue<>();
|
||||
|
||||
public final static Set<String> VALID_ATTRIBUTES = new HashSet<>();
|
||||
public final static ValueTransformer<Double, Integer> TO_OLD_INT = new ValueTransformer<Double, Integer>(Type.INT) {
|
||||
@Override
|
||||
public Integer transform(PacketWrapper wrapper, Double inputValue) {
|
||||
return (int) (inputValue * 32.0D);
|
||||
}
|
||||
};
|
||||
public final static ValueTransformer<Float, Byte> DEGREES_TO_ANGLE = new ValueTransformer<Float, Byte>(Type.BYTE) {
|
||||
@Override
|
||||
public Byte transform(PacketWrapper packetWrapper, Float degrees) throws Exception {
|
||||
return (byte) ((degrees / 360F) * 256);
|
||||
}
|
||||
};
|
||||
|
||||
static {
|
||||
VALID_ATTRIBUTES.add("generic.maxHealth");
|
||||
VALID_ATTRIBUTES.add("generic.followRange");
|
||||
VALID_ATTRIBUTES.add("generic.knockbackResistance");
|
||||
VALID_ATTRIBUTES.add("generic.movementSpeed");
|
||||
VALID_ATTRIBUTES.add("generic.attackDamage");
|
||||
VALID_ATTRIBUTES.add("horse.jumpStrength");
|
||||
VALID_ATTRIBUTES.add("zombie.spawnReinforcements");
|
||||
}
|
||||
|
||||
public Protocol1_8To1_9() {
|
||||
super(ClientboundPackets1_9.class, ClientboundPackets1_8.class, ServerboundPackets1_9.class, ServerboundPackets1_8.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
itemRewriter.register();
|
||||
|
||||
EntityPackets.register(this);
|
||||
InventoryPackets.register(this);
|
||||
PlayerPackets.register(this);
|
||||
ScoreboardPackets.register(this);
|
||||
SpawnPackets.register(this);
|
||||
WorldPackets.register(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(UserConnection userConnection) {
|
||||
Ticker.init();
|
||||
|
||||
userConnection.put(new Windows(userConnection));
|
||||
userConnection.put(new EntityTracker(userConnection, this));
|
||||
userConnection.put(new Levitation(userConnection));
|
||||
userConnection.put(new PlayerPosition(userConnection));
|
||||
userConnection.put(new Cooldown(userConnection));
|
||||
userConnection.put(new BlockPlaceDestroyTracker(userConnection));
|
||||
userConnection.put(new BossBarStorage(userConnection));
|
||||
if (!userConnection.has(ClientWorld.class)) {
|
||||
userConnection.put(new ClientWorld());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReplacementItemRewriter<Protocol1_8To1_9> getItemRewriter() {
|
||||
return itemRewriter;
|
||||
}
|
||||
|
||||
public MetadataRewriter getMetadataRewriter() {
|
||||
return metadataRewriter;
|
||||
}
|
||||
}
|
||||
-98
@@ -1,98 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.entityreplacement;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.api.minecraft.EntityModel;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.Protocol;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public abstract class EntityModel1_8To1_9 extends EntityModel<Protocol1_8To1_9> {
|
||||
|
||||
public EntityModel1_8To1_9(UserConnection user, Protocol1_8To1_9 protocol) {
|
||||
super(user, protocol);
|
||||
}
|
||||
|
||||
protected void sendTeleportWithHead(int entityId, double locX, double locY, double locZ, float yaw, float pitch, float headYaw) {
|
||||
teleportEntity(entityId, locX, locY, locZ, yaw, pitch);
|
||||
sendHeadYaw(entityId, headYaw);
|
||||
}
|
||||
|
||||
protected void teleportEntity(int entityId, double locX, double locY, double locZ, float yaw, float pitch) {
|
||||
PacketWrapper teleport = PacketWrapper.create(ClientboundPackets1_8.ENTITY_TELEPORT, null, user);
|
||||
teleport.write(Type.VAR_INT, entityId);
|
||||
teleport.write(Type.INT, (int) (locX * 32.0));
|
||||
teleport.write(Type.INT, (int) (locY * 32.0));
|
||||
teleport.write(Type.INT, (int) (locZ * 32.0));
|
||||
teleport.write(Type.BYTE, (byte) ((yaw / 360f) * 256));
|
||||
teleport.write(Type.BYTE, (byte) ((pitch / 360f) * 256));
|
||||
teleport.write(Type.BOOLEAN, true);
|
||||
|
||||
PacketUtil.sendPacket(teleport, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
protected void sendHeadYaw(int entityId, float headYaw) {
|
||||
PacketWrapper head = PacketWrapper.create(ClientboundPackets1_8.ENTITY_HEAD_LOOK, null, user);
|
||||
head.write(Type.VAR_INT, entityId);
|
||||
head.write(Type.BYTE, (byte) ((headYaw / 360f) * 256));
|
||||
PacketUtil.sendPacket(head, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
protected void sendSpawn(int entityId, int type) {
|
||||
PacketWrapper spawn = PacketWrapper.create(ClientboundPackets1_8.SPAWN_MOB, null, user);
|
||||
spawn.write(Type.VAR_INT, entityId);
|
||||
spawn.write(Type.UNSIGNED_BYTE, (short) type);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.BYTE, (byte) 0);
|
||||
spawn.write(Type.BYTE, (byte) 0);
|
||||
spawn.write(Type.BYTE, (byte) 0);
|
||||
spawn.write(Type.SHORT, (short) 0);
|
||||
spawn.write(Type.SHORT, (short) 0);
|
||||
spawn.write(Type.SHORT, (short) 0);
|
||||
List<Metadata> list = new ArrayList<>();
|
||||
spawn.write(Types1_8.METADATA_LIST, list);
|
||||
|
||||
PacketUtil.sendPacket(spawn, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
protected void sendSpawnEntity(int entityId, int type) {
|
||||
PacketWrapper spawn = PacketWrapper.create(ClientboundPackets1_8.SPAWN_ENTITY, null, user);
|
||||
spawn.write(Type.VAR_INT, entityId);
|
||||
spawn.write(Type.BYTE, (byte) type);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.INT, 0);
|
||||
spawn.write(Type.BYTE, (byte) 0);
|
||||
spawn.write(Type.BYTE, (byte) 0);
|
||||
spawn.write(Type.INT, 0);
|
||||
|
||||
PacketUtil.sendPacket(spawn, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
}
|
||||
-103
@@ -1,103 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.entityreplacement;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ShulkerBulletModel extends EntityModel1_8To1_9 {
|
||||
private final int entityId;
|
||||
private final List<Metadata> datawatcher = new ArrayList<>();
|
||||
private double locX, locY, locZ;
|
||||
private float yaw, pitch;
|
||||
private float headYaw;
|
||||
|
||||
public ShulkerBulletModel(UserConnection user, Protocol1_8To1_9 protocol, int entityId) {
|
||||
super(user, protocol);
|
||||
this.entityId = entityId;
|
||||
sendSpawnPacket();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateReplacementPosition(double x, double y, double z) {
|
||||
if (x != this.locX || y != this.locY || z != this.locZ) {
|
||||
this.locX = x;
|
||||
this.locY = y;
|
||||
this.locZ = z;
|
||||
updateLocation();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleOriginalMovementPacket(double x, double y, double z) {
|
||||
if (x == 0.0 && y == 0.0 && z == 0.0) return;
|
||||
this.locX += x;
|
||||
this.locY += y;
|
||||
this.locZ += z;
|
||||
updateLocation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setYawPitch(float yaw, float pitch) {
|
||||
if (this.yaw != yaw && this.pitch != pitch) {
|
||||
this.yaw = yaw;
|
||||
this.pitch = pitch;
|
||||
updateLocation();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setHeadYaw(float yaw) {
|
||||
this.headYaw = yaw;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMetadata(List<Metadata> metadataList) {
|
||||
}
|
||||
|
||||
public void updateLocation() {
|
||||
sendTeleportWithHead(entityId, locX, locY, locZ, yaw, pitch, headYaw);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendSpawnPacket() {
|
||||
sendSpawnEntity(entityId, 66);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteEntity() {
|
||||
PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_8.DESTROY_ENTITIES, null, user);
|
||||
despawn.write(Type.VAR_INT_ARRAY_PRIMITIVE, new int[]{entityId});
|
||||
|
||||
PacketUtil.sendPacket(despawn, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEntityId() {
|
||||
return this.entityId;
|
||||
}
|
||||
}
|
||||
-121
@@ -1,121 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.entityreplacement;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ShulkerModel extends EntityModel1_8To1_9 {
|
||||
private final int entityId;
|
||||
private final List<Metadata> datawatcher = new ArrayList<>();
|
||||
private double locX, locY, locZ;
|
||||
|
||||
public ShulkerModel(UserConnection user, Protocol1_8To1_9 protocol, int entityId) {
|
||||
super(user, protocol);
|
||||
this.entityId = entityId;
|
||||
sendSpawnPacket();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateReplacementPosition(double x, double y, double z) {
|
||||
this.locX = x;
|
||||
this.locY = y;
|
||||
this.locZ = z;
|
||||
updateLocation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleOriginalMovementPacket(double x, double y, double z) {
|
||||
this.locX += x;
|
||||
this.locY += y;
|
||||
this.locZ += z;
|
||||
updateLocation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setYawPitch(float yaw, float pitch) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setHeadYaw(float yaw) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMetadata(List<Metadata> metadataList) {
|
||||
for (Metadata metadata : metadataList) {
|
||||
datawatcher.removeIf(m -> m.id() == metadata.id());
|
||||
datawatcher.add(metadata);
|
||||
}
|
||||
updateMetadata();
|
||||
}
|
||||
|
||||
public void updateLocation() {
|
||||
teleportEntity(entityId, locX, locY, locZ, 0, 0);
|
||||
}
|
||||
|
||||
public void updateMetadata() {
|
||||
PacketWrapper metadataPacket = PacketWrapper.create(ClientboundPackets1_8.ENTITY_METADATA, null, user);
|
||||
metadataPacket.write(Type.VAR_INT, entityId);
|
||||
|
||||
List<Metadata> metadataList = new ArrayList<>();
|
||||
for (Metadata metadata : datawatcher) {
|
||||
if (metadata.id() == 11 || metadata.id() == 12 || metadata.id() == 13) continue;
|
||||
metadataList.add(new Metadata(metadata.id(), metadata.metaType(), metadata.getValue()));
|
||||
}
|
||||
metadataList.add(new Metadata(11, MetaType1_9.VarInt, 2));
|
||||
|
||||
getProtocol().getMetadataRewriter().transform(user.get(EntityTracker.class), entityId, metadataList, EntityTypes1_10.EntityType.MAGMA_CUBE);
|
||||
|
||||
metadataPacket.write(Types1_8.METADATA_LIST, metadataList);
|
||||
|
||||
PacketUtil.sendPacket(metadataPacket, Protocol1_8To1_9.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendSpawnPacket() {
|
||||
sendSpawn(entityId, 62);
|
||||
// Old clients don't like empty metadata
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteEntity() {
|
||||
PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, null, user);
|
||||
despawn.write(Type.VAR_INT_ARRAY_PRIMITIVE, new int[]{entityId});
|
||||
|
||||
PacketUtil.sendPacket(despawn, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEntityId() {
|
||||
return this.entityId;
|
||||
}
|
||||
}
|
||||
-152
@@ -1,152 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.metadata;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
|
||||
import com.viaversion.viaversion.api.minecraft.EulerAngle;
|
||||
import com.viaversion.viaversion.api.minecraft.Vector;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.metadata.MetaIndex;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class MetadataRewriter {
|
||||
private final Protocol1_8To1_9 protocol;
|
||||
|
||||
public MetadataRewriter(Protocol1_8To1_9 protocol) {
|
||||
this.protocol = protocol;
|
||||
}
|
||||
|
||||
public void transform(EntityTracker tracker, int entityId, List<Metadata> list) {
|
||||
transform(tracker, entityId, list, tracker.getClientEntityTypes().get(entityId));
|
||||
}
|
||||
|
||||
private static final byte HAND_ACTIVE_BIT = 0;
|
||||
private static final byte STATUS_USE_BIT = 4;
|
||||
|
||||
public void transform(EntityTracker tracker, int entityId, List<Metadata> list, EntityType entityType) {
|
||||
for (Metadata metadata : list) {
|
||||
if (metadata.id() == MetaIndex.ENTITY_STATUS.getIndex()) {
|
||||
tracker.getStatusInformation().put(entityId, (Byte) metadata.getValue());
|
||||
}
|
||||
}
|
||||
for (Metadata entry : new ArrayList<>(list)) {
|
||||
MetaIndex metaIndex = MetaIndex1_8to1_9.searchIndex(entityType, entry.id());
|
||||
try {
|
||||
if (metaIndex != null) {
|
||||
if (metaIndex.getOldType() == MetaType1_8.NonExistent || metaIndex.getNewType() == null) {
|
||||
list.remove(entry);
|
||||
if (metaIndex == MetaIndex.PLAYER_HAND) {
|
||||
byte status = tracker.getStatusInformation().getOrDefault(entityId, (byte) 0);
|
||||
if ((((byte) entry.value()) & 1 << HAND_ACTIVE_BIT) != 0) {
|
||||
status = (byte) (status | 1 << STATUS_USE_BIT);
|
||||
} else {
|
||||
status = (byte) (status & ~(1 << STATUS_USE_BIT));
|
||||
}
|
||||
list.add(new Metadata(MetaIndex.ENTITY_STATUS.getIndex(), MetaType1_8.Byte, status));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
Object value = entry.getValue();
|
||||
entry.setMetaTypeUnsafe(metaIndex.getOldType());
|
||||
entry.setId(metaIndex.getIndex());
|
||||
switch (metaIndex.getNewType()) {
|
||||
case Byte:
|
||||
if (metaIndex.getOldType() == MetaType1_8.Byte) {
|
||||
entry.setValue(value);
|
||||
}
|
||||
if (metaIndex.getOldType() == MetaType1_8.Int) {
|
||||
entry.setValue(((Byte) value).intValue());
|
||||
}
|
||||
break;
|
||||
case OptUUID:
|
||||
if (metaIndex.getOldType() != MetaType1_8.String) {
|
||||
list.remove(entry);
|
||||
break;
|
||||
}
|
||||
UUID owner = (UUID) value;
|
||||
if (owner == null) entry.setValue("");
|
||||
else entry.setValue(owner.toString());
|
||||
break;
|
||||
case BlockID:
|
||||
list.remove(entry);
|
||||
list.add(new Metadata(metaIndex.getIndex(), MetaType1_8.Short, ((Integer) value).shortValue()));
|
||||
break;
|
||||
case VarInt:
|
||||
if (metaIndex.getOldType() == MetaType1_8.Byte) {
|
||||
entry.setValue(((Integer) value).byteValue());
|
||||
}
|
||||
if (metaIndex.getOldType() == MetaType1_8.Short) {
|
||||
entry.setValue(((Integer) value).shortValue());
|
||||
}
|
||||
if (metaIndex.getOldType() == MetaType1_8.Int) {
|
||||
entry.setValue(value);
|
||||
}
|
||||
break;
|
||||
case Float:
|
||||
entry.setValue(value);
|
||||
break;
|
||||
case String:
|
||||
entry.setValue(value);
|
||||
break;
|
||||
case Boolean:
|
||||
if (metaIndex == MetaIndex.AGEABLE_AGE) entry.setValue((byte) ((Boolean) value ? -1 : 0));
|
||||
else entry.setValue((byte) ((Boolean) value ? 1 : 0));
|
||||
break;
|
||||
case Slot:
|
||||
entry.setValue(protocol.getItemRewriter().handleItemToClient((Item) value));
|
||||
break;
|
||||
case Position:
|
||||
Vector vector = (Vector) value;
|
||||
entry.setValue(vector);
|
||||
break;
|
||||
case Vector3F:
|
||||
EulerAngle angle = (EulerAngle) value;
|
||||
entry.setValue(angle);
|
||||
break;
|
||||
case Chat:
|
||||
entry.setValue(value);
|
||||
break;
|
||||
default:
|
||||
ViaRewind.getPlatform().getLogger().warning("[Out] Unhandled MetaDataType: " + metaIndex.getNewType());
|
||||
list.remove(entry);
|
||||
break;
|
||||
}
|
||||
|
||||
if (!metaIndex.getOldType().type().getOutputClass().isAssignableFrom(entry.getValue().getClass())) {
|
||||
list.remove(entry);
|
||||
}
|
||||
|
||||
} else {
|
||||
throw new Exception("Could not find valid metadata");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
list.remove(entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
-482
@@ -1,482 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.Cooldown;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.Levitation;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.PlayerPosition;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.util.RelativeMoveUtil;
|
||||
import com.viaversion.viarewind.api.minecraft.EntityModel;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.Vector;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_9;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
import com.viaversion.viaversion.util.Pair;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class EntityPackets {
|
||||
|
||||
public static void register(final Protocol1_8To1_9 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_STATUS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
handler(packetWrapper -> {
|
||||
byte status = packetWrapper.read(Type.BYTE);
|
||||
if (status > 23) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
packetWrapper.write(Type.BYTE, status);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Relative Move
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
int relX = packetWrapper.read(Type.SHORT);
|
||||
int relY = packetWrapper.read(Type.SHORT);
|
||||
int relZ = packetWrapper.read(Type.SHORT);
|
||||
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement = tracker.getEntityReplacement(entityId);
|
||||
if (replacement != null) {
|
||||
packetWrapper.cancel();
|
||||
replacement.handleOriginalMovementPacket(relX / 4096.0, relY / 4096.0, relZ / 4096.0);
|
||||
return;
|
||||
}
|
||||
|
||||
Vector[] moves = RelativeMoveUtil.calculateRelativeMoves(packetWrapper.user(), entityId, relX, relY, relZ);
|
||||
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockX());
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockY());
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockZ());
|
||||
|
||||
boolean onGround = packetWrapper.passthrough(Type.BOOLEAN);
|
||||
|
||||
if (moves.length > 1) {
|
||||
PacketWrapper secondPacket = PacketWrapper.create(ClientboundPackets1_8.ENTITY_POSITION, null, packetWrapper.user());
|
||||
secondPacket.write(Type.VAR_INT, packetWrapper.get(Type.VAR_INT, 0));
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockX());
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockY());
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockZ());
|
||||
secondPacket.write(Type.BOOLEAN, onGround);
|
||||
|
||||
PacketUtil.sendPacket(secondPacket, Protocol1_8To1_9.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Relative Move And Look
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_POSITION_AND_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
int relX = packetWrapper.read(Type.SHORT);
|
||||
int relY = packetWrapper.read(Type.SHORT);
|
||||
int relZ = packetWrapper.read(Type.SHORT);
|
||||
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement = tracker.getEntityReplacement(entityId);
|
||||
if (replacement != null) {
|
||||
packetWrapper.cancel();
|
||||
replacement.handleOriginalMovementPacket(relX / 4096.0, relY / 4096.0, relZ / 4096.0);
|
||||
replacement.setYawPitch(packetWrapper.read(Type.BYTE) * 360f / 256, packetWrapper.read(Type.BYTE) * 360f / 256);
|
||||
return;
|
||||
}
|
||||
|
||||
Vector[] moves = RelativeMoveUtil.calculateRelativeMoves(packetWrapper.user(), entityId, relX, relY, relZ);
|
||||
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockX());
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockY());
|
||||
packetWrapper.write(Type.BYTE, (byte) moves[0].blockZ());
|
||||
|
||||
byte yaw = packetWrapper.passthrough(Type.BYTE);
|
||||
byte pitch = packetWrapper.passthrough(Type.BYTE);
|
||||
boolean onGround = packetWrapper.passthrough(Type.BOOLEAN);
|
||||
|
||||
EntityTypes1_10.EntityType type = packetWrapper.user().get(EntityTracker.class).getClientEntityTypes().get(entityId);
|
||||
if (type == EntityTypes1_10.EntityType.BOAT) {
|
||||
yaw -= 64;
|
||||
packetWrapper.set(Type.BYTE, 3, yaw);
|
||||
}
|
||||
|
||||
if (moves.length > 1) {
|
||||
PacketWrapper secondPacket = PacketWrapper.create(ClientboundPackets1_8.ENTITY_POSITION_AND_ROTATION, null, packetWrapper.user());
|
||||
secondPacket.write(Type.VAR_INT, packetWrapper.get(Type.VAR_INT, 0));
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockX());
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockY());
|
||||
secondPacket.write(Type.BYTE, (byte) moves[1].blockZ());
|
||||
secondPacket.write(Type.BYTE, yaw);
|
||||
secondPacket.write(Type.BYTE, pitch);
|
||||
secondPacket.write(Type.BOOLEAN, onGround);
|
||||
|
||||
PacketUtil.sendPacket(secondPacket, Protocol1_8To1_9.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Look
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement = tracker.getEntityReplacement(entityId);
|
||||
if (replacement != null) {
|
||||
packetWrapper.cancel();
|
||||
int yaw = packetWrapper.get(Type.BYTE, 0);
|
||||
int pitch = packetWrapper.get(Type.BYTE, 1);
|
||||
replacement.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTypes1_10.EntityType type = packetWrapper.user().get(EntityTracker.class).getClientEntityTypes().get(entityId);
|
||||
if (type == EntityTypes1_10.EntityType.BOAT) {
|
||||
byte yaw = packetWrapper.get(Type.BYTE, 0);
|
||||
yaw -= 64;
|
||||
packetWrapper.set(Type.BYTE, 0, yaw);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity
|
||||
|
||||
//Vehicle Move -> Entity Teleport
|
||||
protocol.registerClientbound(ClientboundPackets1_9.VEHICLE_MOVE, ClientboundPackets1_8.ENTITY_TELEPORT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
int vehicle = tracker.getVehicle(tracker.getPlayerId());
|
||||
if (vehicle == -1) packetWrapper.cancel();
|
||||
packetWrapper.write(Type.VAR_INT, vehicle);
|
||||
});
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.FLOAT, Protocol1_8To1_9.DEGREES_TO_ANGLE);
|
||||
map(Type.FLOAT, Protocol1_8To1_9.DEGREES_TO_ANGLE);
|
||||
handler(packetWrapper -> {
|
||||
if (packetWrapper.isCancelled()) return;
|
||||
PlayerPosition position = packetWrapper.user().get(PlayerPosition.class);
|
||||
double x = packetWrapper.get(Type.INT, 0) / 32d;
|
||||
double y = packetWrapper.get(Type.INT, 1) / 32d;
|
||||
double z = packetWrapper.get(Type.INT, 2) / 32d;
|
||||
position.setPos(x, y, z);
|
||||
});
|
||||
create(Type.BOOLEAN, true);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTypes1_10.EntityType type = packetWrapper.user().get(EntityTracker.class).getClientEntityTypes().get(entityId);
|
||||
if (type == EntityTypes1_10.EntityType.BOAT) {
|
||||
byte yaw = packetWrapper.get(Type.BYTE, 1);
|
||||
yaw -= 64;
|
||||
packetWrapper.set(Type.BYTE, 0, yaw);
|
||||
int y = packetWrapper.get(Type.INT, 1);
|
||||
y += 10;
|
||||
packetWrapper.set(Type.INT, 1, y);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Use Bed
|
||||
|
||||
//Destroy Entities
|
||||
protocol.registerClientbound(ClientboundPackets1_9.DESTROY_ENTITIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT_ARRAY_PRIMITIVE);
|
||||
handler(packetWrapper -> {
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
for (int entityId : packetWrapper.get(Type.VAR_INT_ARRAY_PRIMITIVE, 0))
|
||||
tracker.removeEntity(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Remove Entity Effect
|
||||
protocol.registerClientbound(ClientboundPackets1_9.REMOVE_ENTITY_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
int id = packetWrapper.get(Type.BYTE, 0);
|
||||
if (id > 23) packetWrapper.cancel();
|
||||
if (id == 25) {
|
||||
if (packetWrapper.get(Type.VAR_INT, 0) != packetWrapper.user().get(EntityTracker.class).getPlayerId())
|
||||
return;
|
||||
Levitation levitation = packetWrapper.user().get(Levitation.class);
|
||||
levitation.setActive(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Head Look
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_HEAD_LOOK, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement = tracker.getEntityReplacement(entityId);
|
||||
if (replacement != null) {
|
||||
packetWrapper.cancel();
|
||||
int yaw = packetWrapper.get(Type.BYTE, 0);
|
||||
replacement.setHeadYaw(yaw * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Metadata
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_METADATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Types1_9.METADATA_LIST, Types1_8.METADATA_LIST);
|
||||
handler(wrapper -> {
|
||||
List<Metadata> metadataList = wrapper.get(Types1_8.METADATA_LIST, 0);
|
||||
int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = wrapper.user().get(EntityTracker.class);
|
||||
if (tracker.getClientEntityTypes().containsKey(entityId)) {
|
||||
protocol.getMetadataRewriter().transform(tracker, entityId, metadataList);
|
||||
if (metadataList.isEmpty()) wrapper.cancel();
|
||||
} else {
|
||||
tracker.addMetadataToBuffer(entityId, metadataList);
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Attach Entity
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ATTACH_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
create(Type.BOOLEAN, true);
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Velocity
|
||||
|
||||
//Entity Equipment
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_EQUIPMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
// todo check if this is correct for the own player
|
||||
int slot = packetWrapper.read(Type.VAR_INT);
|
||||
if (slot == 1) {
|
||||
packetWrapper.cancel();
|
||||
} else if (slot > 1) {
|
||||
slot -= 1;
|
||||
}
|
||||
packetWrapper.write(Type.SHORT, (short) slot);
|
||||
});
|
||||
map(Type.ITEM1_8);
|
||||
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM1_8, 0))));
|
||||
}
|
||||
});
|
||||
|
||||
//Set Passengers
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SET_PASSENGERS, null, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
EntityTracker entityTracker = packetWrapper.user().get(EntityTracker.class);
|
||||
int vehicle = packetWrapper.read(Type.VAR_INT);
|
||||
int count = packetWrapper.read(Type.VAR_INT);
|
||||
ArrayList<Integer> passengers = new ArrayList<>();
|
||||
for (int i = 0; i < count; i++) passengers.add(packetWrapper.read(Type.VAR_INT));
|
||||
List<Integer> oldPassengers = entityTracker.getPassengers(vehicle);
|
||||
entityTracker.setPassengers(vehicle, passengers);
|
||||
if (!oldPassengers.isEmpty()) {
|
||||
for (Integer passenger : oldPassengers) {
|
||||
PacketWrapper detach = PacketWrapper.create(ClientboundPackets1_8.ATTACH_ENTITY, null, packetWrapper.user());
|
||||
detach.write(Type.INT, passenger);
|
||||
detach.write(Type.INT, -1);
|
||||
detach.write(Type.BOOLEAN, false);
|
||||
PacketUtil.sendPacket(detach, Protocol1_8To1_9.class);
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < count; i++) {
|
||||
int v = i == 0 ? vehicle : passengers.get(i - 1);
|
||||
int p = passengers.get(i);
|
||||
PacketWrapper attach = PacketWrapper.create(ClientboundPackets1_8.ATTACH_ENTITY, null, packetWrapper.user());
|
||||
attach.write(Type.INT, p);
|
||||
attach.write(Type.INT, v);
|
||||
attach.write(Type.BOOLEAN, false);
|
||||
PacketUtil.sendPacket(attach, Protocol1_8To1_9.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Collect Item
|
||||
|
||||
//Entity Teleport
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_TELEPORT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTypes1_10.EntityType type = packetWrapper.user().get(EntityTracker.class).getClientEntityTypes().get(entityId);
|
||||
if (type == EntityTypes1_10.EntityType.BOAT) {
|
||||
byte yaw = packetWrapper.get(Type.BYTE, 1);
|
||||
yaw -= 64;
|
||||
packetWrapper.set(Type.BYTE, 0, yaw);
|
||||
int y = packetWrapper.get(Type.INT, 1);
|
||||
y += 10;
|
||||
packetWrapper.set(Type.INT, 1, y);
|
||||
}
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
packetWrapper.user().get(EntityTracker.class).resetEntityOffset(entityId);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement = tracker.getEntityReplacement(entityId);
|
||||
if (replacement != null) {
|
||||
packetWrapper.cancel();
|
||||
int x = packetWrapper.get(Type.INT, 0);
|
||||
int y = packetWrapper.get(Type.INT, 1);
|
||||
int z = packetWrapper.get(Type.INT, 2);
|
||||
int yaw = packetWrapper.get(Type.BYTE, 0);
|
||||
int pitch = packetWrapper.get(Type.BYTE, 1);
|
||||
replacement.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
replacement.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Properties
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_PROPERTIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.INT);
|
||||
handler(packetWrapper -> {
|
||||
boolean player = packetWrapper.get(Type.VAR_INT, 0) == packetWrapper.user().get(EntityTracker.class).getPlayerId();
|
||||
int size = packetWrapper.get(Type.INT, 0);
|
||||
int removed = 0;
|
||||
for (int i = 0; i < size; i++) {
|
||||
String key = packetWrapper.read(Type.STRING);
|
||||
boolean skip = !Protocol1_8To1_9.VALID_ATTRIBUTES.contains(key);
|
||||
double value = packetWrapper.read(Type.DOUBLE);
|
||||
int modifierSize = packetWrapper.read(Type.VAR_INT);
|
||||
if (!skip) {
|
||||
packetWrapper.write(Type.STRING, key);
|
||||
packetWrapper.write(Type.DOUBLE, value);
|
||||
packetWrapper.write(Type.VAR_INT, modifierSize);
|
||||
} else {
|
||||
removed++;
|
||||
}
|
||||
ArrayList<Pair<Byte, Double>> modifiers = new ArrayList<>();
|
||||
for (int j = 0; j < modifierSize; j++) {
|
||||
UUID uuid = packetWrapper.read(Type.UUID);
|
||||
double amount = packetWrapper.read(Type.DOUBLE);
|
||||
byte operation = packetWrapper.read(Type.BYTE);
|
||||
modifiers.add(new Pair<>(operation, amount));
|
||||
if (skip) continue;
|
||||
packetWrapper.write(Type.UUID, uuid);
|
||||
packetWrapper.write(Type.DOUBLE, amount);
|
||||
packetWrapper.write(Type.BYTE, operation);
|
||||
}
|
||||
if (player && key.equals("generic.attackSpeed")) {
|
||||
packetWrapper.user().get(Cooldown.class).setAttackSpeed(value, modifiers);
|
||||
}
|
||||
}
|
||||
packetWrapper.set(Type.INT, 0, size - removed);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Effect
|
||||
protocol.registerClientbound(ClientboundPackets1_9.ENTITY_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
int id = packetWrapper.get(Type.BYTE, 0);
|
||||
if (id > 23) packetWrapper.cancel();
|
||||
if (id == 25) {
|
||||
if (packetWrapper.get(Type.VAR_INT, 0) != packetWrapper.user().get(EntityTracker.class).getPlayerId())
|
||||
return;
|
||||
Levitation levitation = packetWrapper.user().get(Levitation.class);
|
||||
levitation.setActive(true);
|
||||
levitation.setAmplifier(packetWrapper.get(Type.BYTE, 1));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-187
@@ -1,187 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.Windows;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.libs.gson.JsonParser;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
|
||||
public class InventoryPackets {
|
||||
|
||||
public static void register(final Protocol1_8To1_9 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_9.CLOSE_WINDOW, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
short windowsId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
packetWrapper.user().get(Windows.class).remove(windowsId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Open Window
|
||||
protocol.registerClientbound(ClientboundPackets1_9.OPEN_WINDOW, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.STRING);
|
||||
map(Type.COMPONENT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
String type = packetWrapper.get(Type.STRING, 0);
|
||||
if (type.equals("EntityHorse")) packetWrapper.passthrough(Type.INT);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
short windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
String windowType = packetWrapper.get(Type.STRING, 0);
|
||||
packetWrapper.user().get(Windows.class).put(windowId, windowType);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
String type = packetWrapper.get(Type.STRING, 0);
|
||||
if (type.equalsIgnoreCase("minecraft:shulker_box")) {
|
||||
packetWrapper.set(Type.STRING, 0, type = "minecraft:container");
|
||||
}
|
||||
String name = packetWrapper.get(Type.COMPONENT, 0).toString();
|
||||
if (name.equalsIgnoreCase("{\"translate\":\"container.shulkerBox\"}")) {
|
||||
packetWrapper.set(Type.COMPONENT, 0, JsonParser.parseString("{\"text\":\"Shulker Box\"}"));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Window Items
|
||||
protocol.registerClientbound(ClientboundPackets1_9.WINDOW_ITEMS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
short windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
Item[] items = packetWrapper.read(Type.ITEM1_8_SHORT_ARRAY);
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
items[i] = protocol.getItemRewriter().handleItemToClient(items[i]);
|
||||
}
|
||||
if (windowId == 0 && items.length == 46) {
|
||||
Item[] old = items;
|
||||
items = new Item[45];
|
||||
System.arraycopy(old, 0, items, 0, 45);
|
||||
} else {
|
||||
String type = packetWrapper.user().get(Windows.class).get(windowId);
|
||||
if (type != null && type.equalsIgnoreCase("minecraft:brewing_stand")) {
|
||||
System.arraycopy(items, 0, packetWrapper.user().get(Windows.class).getBrewingItems(windowId), 0, 4);
|
||||
Windows.updateBrewingStand(packetWrapper.user(), items[4], windowId);
|
||||
Item[] old = items;
|
||||
items = new Item[old.length - 1];
|
||||
System.arraycopy(old, 0, items, 0, 4);
|
||||
System.arraycopy(old, 5, items, 4, old.length - 5);
|
||||
}
|
||||
}
|
||||
packetWrapper.write(Type.ITEM1_8_SHORT_ARRAY, items);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Window Property
|
||||
|
||||
//Set Slot
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SET_SLOT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.SHORT);
|
||||
map(Type.ITEM1_8);
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM1_8, 0)));
|
||||
byte windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0).byteValue();
|
||||
short slot = packetWrapper.get(Type.SHORT, 0);
|
||||
if (windowId == 0 && slot == 45) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
String type = packetWrapper.user().get(Windows.class).get(windowId);
|
||||
if (type == null) return;
|
||||
if (type.equalsIgnoreCase("minecraft:brewing_stand")) {
|
||||
if (slot > 4) {
|
||||
packetWrapper.set(Type.SHORT, 0, slot -= 1);
|
||||
} else if (slot == 4) {
|
||||
packetWrapper.cancel();
|
||||
Windows.updateBrewingStand(packetWrapper.user(), packetWrapper.get(Type.ITEM1_8, 0), windowId);
|
||||
} else {
|
||||
packetWrapper.user().get(Windows.class).getBrewingItems(windowId)[slot] = packetWrapper.get(Type.ITEM1_8, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
/* INCOMING */
|
||||
|
||||
//Close Window
|
||||
protocol.registerServerbound(ServerboundPackets1_8.CLOSE_WINDOW, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
short windowsId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
packetWrapper.user().get(Windows.class).remove(windowsId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Click Window
|
||||
protocol.registerServerbound(ServerboundPackets1_8.CLICK_WINDOW, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.SHORT);
|
||||
map(Type.BYTE);
|
||||
map(Type.SHORT);
|
||||
map(Type.BYTE, Type.VAR_INT);
|
||||
map(Type.ITEM1_8);
|
||||
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM1_8, 0))));
|
||||
handler(packetWrapper -> {
|
||||
short windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
Windows windows = packetWrapper.user().get(Windows.class);
|
||||
String type = windows.get(windowId);
|
||||
if (type == null) return;
|
||||
if (type.equalsIgnoreCase("minecraft:brewing_stand")) {
|
||||
short slot = packetWrapper.get(Type.SHORT, 0);
|
||||
if (slot > 3) {
|
||||
packetWrapper.set(Type.SHORT, 0, slot += 1);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_8.CREATIVE_INVENTORY_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.SHORT);
|
||||
map(Type.ITEM1_8);
|
||||
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM1_8, 0))));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-635
@@ -1,635 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.*;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.rewriter.ItemRewriter;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerPackets {
|
||||
|
||||
public static void register(final Protocol1_8To1_9 protocol) {
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_9.BOSSBAR, null, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
|
||||
UUID uuid = packetWrapper.read(Type.UUID);
|
||||
int action = packetWrapper.read(Type.VAR_INT);
|
||||
BossBarStorage bossBarStorage = packetWrapper.user().get(BossBarStorage.class);
|
||||
if (action == 0) {
|
||||
bossBarStorage.add(uuid, ChatUtil.jsonToLegacy(packetWrapper.read(Type.COMPONENT)), packetWrapper.read(Type.FLOAT));
|
||||
packetWrapper.read(Type.VAR_INT);
|
||||
packetWrapper.read(Type.VAR_INT);
|
||||
packetWrapper.read(Type.UNSIGNED_BYTE);
|
||||
} else if (action == 1) {
|
||||
bossBarStorage.remove(uuid);
|
||||
} else if (action == 2) {
|
||||
bossBarStorage.updateHealth(uuid, packetWrapper.read(Type.FLOAT));
|
||||
} else if (action == 3) {
|
||||
String title = ChatUtil.jsonToLegacy(packetWrapper.read(Type.COMPONENT));
|
||||
bossBarStorage.updateTitle(uuid, title);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Tab-Complete
|
||||
//Chat Message
|
||||
|
||||
//Set Cooldown
|
||||
protocol.cancelClientbound(ClientboundPackets1_9.COOLDOWN);
|
||||
|
||||
//Custom Payload
|
||||
protocol.registerClientbound(ClientboundPackets1_9.PLUGIN_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String channel = packetWrapper.get(Type.STRING, 0);
|
||||
if (channel.equals("MC|TrList")) {
|
||||
packetWrapper.passthrough(Type.INT); //Window Id
|
||||
|
||||
int size;
|
||||
if (packetWrapper.isReadable(Type.BYTE, 0)) {
|
||||
size = packetWrapper.passthrough(Type.BYTE);
|
||||
} else {
|
||||
size = packetWrapper.passthrough(Type.UNSIGNED_BYTE);
|
||||
}
|
||||
|
||||
final ItemRewriter<?> itemRewriter = protocol.getItemRewriter();
|
||||
|
||||
for (int i = 0; i < size; i++) {
|
||||
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 1
|
||||
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 3
|
||||
|
||||
boolean has3Items = packetWrapper.passthrough(Type.BOOLEAN);
|
||||
if (has3Items) {
|
||||
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 2
|
||||
}
|
||||
|
||||
packetWrapper.passthrough(Type.BOOLEAN); //Unavailable
|
||||
packetWrapper.passthrough(Type.INT); //Uses
|
||||
packetWrapper.passthrough(Type.INT); //Max Uses
|
||||
}
|
||||
} else if (channel.equals("MC|BOpen")) {
|
||||
packetWrapper.read(Type.VAR_INT);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Disconnect
|
||||
//Change Game State
|
||||
protocol.registerClientbound(ClientboundPackets1_9.GAME_EVENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.FLOAT);
|
||||
handler(packetWrapper -> {
|
||||
int reason = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
if (reason == 3)
|
||||
packetWrapper.user().get(EntityTracker.class).setPlayerGamemode(packetWrapper.get(Type.FLOAT, 0).intValue());
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Join Game
|
||||
protocol.registerClientbound(ClientboundPackets1_9.JOIN_GAME, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.STRING);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.setPlayerId(packetWrapper.get(Type.INT, 0));
|
||||
tracker.setPlayerGamemode(packetWrapper.get(Type.UNSIGNED_BYTE, 0));
|
||||
tracker.getClientEntityTypes().put(tracker.getPlayerId(), EntityTypes1_10.EntityType.ENTITY_HUMAN);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
ClientWorld world = packetWrapper.user().get(ClientWorld.class);
|
||||
world.setEnvironment(packetWrapper.get(Type.BYTE, 0));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Open Sign Editor
|
||||
//Player Abilities
|
||||
//Player List Item
|
||||
|
||||
//Player Position And Look
|
||||
protocol.registerClientbound(ClientboundPackets1_9.PLAYER_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
PlayerPosition pos = packetWrapper.user().get(PlayerPosition.class);
|
||||
|
||||
int teleportId = packetWrapper.read(Type.VAR_INT);
|
||||
pos.setConfirmId(teleportId);
|
||||
|
||||
byte flags = packetWrapper.get(Type.BYTE, 0);
|
||||
double x = packetWrapper.get(Type.DOUBLE, 0);
|
||||
double y = packetWrapper.get(Type.DOUBLE, 1);
|
||||
double z = packetWrapper.get(Type.DOUBLE, 2);
|
||||
float yaw = packetWrapper.get(Type.FLOAT, 0);
|
||||
float pitch = packetWrapper.get(Type.FLOAT, 1);
|
||||
|
||||
packetWrapper.set(Type.BYTE, 0, (byte) 0);
|
||||
|
||||
if (flags != 0) {
|
||||
if ((flags & 0x01) != 0) {
|
||||
x += pos.getPosX();
|
||||
packetWrapper.set(Type.DOUBLE, 0, x);
|
||||
}
|
||||
if ((flags & 0x02) != 0) {
|
||||
y += pos.getPosY();
|
||||
packetWrapper.set(Type.DOUBLE, 1, y);
|
||||
}
|
||||
if ((flags & 0x04) != 0) {
|
||||
z += pos.getPosZ();
|
||||
packetWrapper.set(Type.DOUBLE, 2, z);
|
||||
}
|
||||
if ((flags & 0x08) != 0) {
|
||||
yaw += pos.getYaw();
|
||||
packetWrapper.set(Type.FLOAT, 0, yaw);
|
||||
}
|
||||
if ((flags & 0x10) != 0) {
|
||||
pitch += pos.getPitch();
|
||||
packetWrapper.set(Type.FLOAT, 1, pitch);
|
||||
}
|
||||
}
|
||||
|
||||
pos.setPos(x, y, z);
|
||||
pos.setYaw(yaw);
|
||||
pos.setPitch(pitch);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Resource Pack Send
|
||||
|
||||
//Respawn
|
||||
protocol.registerClientbound(ClientboundPackets1_9.RESPAWN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> packetWrapper.user().get(EntityTracker.class).setPlayerGamemode(packetWrapper.get(Type.UNSIGNED_BYTE, 1)));
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.user().get(BossBarStorage.class).updateLocation();
|
||||
packetWrapper.user().get(BossBarStorage.class).changeWorld();
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
ClientWorld world = packetWrapper.user().get(ClientWorld.class);
|
||||
world.setEnvironment(packetWrapper.get(Type.INT, 0));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Camera
|
||||
//Held Item Change
|
||||
//Set Experience
|
||||
//Update Health
|
||||
//Spawn Position
|
||||
//Title
|
||||
//Player List Header And Footer
|
||||
|
||||
/* INCOMING */
|
||||
|
||||
//Chat Message
|
||||
protocol.registerServerbound(ServerboundPackets1_8.CHAT_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String msg = packetWrapper.get(Type.STRING, 0);
|
||||
if (msg.toLowerCase().startsWith("/offhand")) {
|
||||
packetWrapper.cancel();
|
||||
PacketWrapper swapItems = PacketWrapper.create(0x13, null, packetWrapper.user());
|
||||
swapItems.write(Type.VAR_INT, 6);
|
||||
swapItems.write(Type.POSITION1_8, new Position(0, 0, 0));
|
||||
swapItems.write(Type.BYTE, (byte) 255);
|
||||
|
||||
PacketUtil.sendToServer(swapItems, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Confirm Transaction
|
||||
|
||||
//Use Entity
|
||||
protocol.registerServerbound(ServerboundPackets1_8.INTERACT_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int type = packetWrapper.get(Type.VAR_INT, 1);
|
||||
if (type == 2) {
|
||||
packetWrapper.passthrough(Type.FLOAT);
|
||||
packetWrapper.passthrough(Type.FLOAT);
|
||||
packetWrapper.passthrough(Type.FLOAT);
|
||||
}
|
||||
if (type == 2 || type == 0) {
|
||||
packetWrapper.write(Type.VAR_INT, 0);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_MOVEMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
//Sending any queued animations.
|
||||
PacketWrapper animation = null;
|
||||
while ((animation = ((Protocol1_8To1_9) protocol).animationsToSend.poll()) != null) {
|
||||
PacketUtil.sendToServer(animation, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
int playerId = tracker.getPlayerId();
|
||||
if (tracker.isInsideVehicle(playerId)) packetWrapper.cancel();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player Position
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
//Sending any queued animations.
|
||||
PacketWrapper animation = null;
|
||||
while ((animation = ((Protocol1_8To1_9) protocol).animationsToSend.poll()) != null) {
|
||||
PacketUtil.sendToServer(animation, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
PlayerPosition pos = packetWrapper.user().get(PlayerPosition.class);
|
||||
if (pos.getConfirmId() != -1) return;
|
||||
pos.setPos(packetWrapper.get(Type.DOUBLE, 0), packetWrapper.get(Type.DOUBLE, 1),
|
||||
packetWrapper.get(Type.DOUBLE, 2));
|
||||
pos.setOnGround(packetWrapper.get(Type.BOOLEAN, 0));
|
||||
});
|
||||
handler(packetWrapper -> packetWrapper.user().get(BossBarStorage.class).updateLocation());
|
||||
}
|
||||
});
|
||||
|
||||
//Player Look
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
//Sending any queued animations.
|
||||
PacketWrapper animation = null;
|
||||
while ((animation = ((Protocol1_8To1_9) protocol).animationsToSend.poll()) != null) {
|
||||
PacketUtil.sendToServer(animation, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
PlayerPosition pos = packetWrapper.user().get(PlayerPosition.class);
|
||||
if (pos.getConfirmId() != -1) return;
|
||||
pos.setYaw(packetWrapper.get(Type.FLOAT, 0));
|
||||
pos.setPitch(packetWrapper.get(Type.FLOAT, 1));
|
||||
pos.setOnGround(packetWrapper.get(Type.BOOLEAN, 0));
|
||||
});
|
||||
handler(packetWrapper -> packetWrapper.user().get(BossBarStorage.class).updateLocation());
|
||||
}
|
||||
});
|
||||
|
||||
//Player Position And Look
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_POSITION_AND_ROTATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.DOUBLE);
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
//Sending any queued animations.
|
||||
PacketWrapper animation = null;
|
||||
while ((animation = ((Protocol1_8To1_9) protocol).animationsToSend.poll()) != null) {
|
||||
PacketUtil.sendToServer(animation, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
|
||||
double x = packetWrapper.get(Type.DOUBLE, 0);
|
||||
double y = packetWrapper.get(Type.DOUBLE, 1);
|
||||
double z = packetWrapper.get(Type.DOUBLE, 2);
|
||||
float yaw = packetWrapper.get(Type.FLOAT, 0);
|
||||
float pitch = packetWrapper.get(Type.FLOAT, 1);
|
||||
boolean onGround = packetWrapper.get(Type.BOOLEAN, 0);
|
||||
|
||||
PlayerPosition pos = packetWrapper.user().get(PlayerPosition.class);
|
||||
if (pos.getConfirmId() != -1) {
|
||||
if (pos.getPosX() == x && pos.getPosY() == y && pos.getPosZ() == z
|
||||
&& pos.getYaw() == yaw && pos.getPitch() == pitch) {
|
||||
PacketWrapper confirmTeleport = packetWrapper.create(0x00);
|
||||
confirmTeleport.write(Type.VAR_INT, pos.getConfirmId());
|
||||
PacketUtil.sendToServer(confirmTeleport,
|
||||
Protocol1_8To1_9.class, true, true);
|
||||
|
||||
pos.setConfirmId(-1);
|
||||
}
|
||||
} else {
|
||||
pos.setPos(x, y, z);
|
||||
pos.setYaw(yaw);
|
||||
pos.setPitch(pitch);
|
||||
pos.setOnGround(onGround);
|
||||
packetWrapper.user().get(BossBarStorage.class).updateLocation();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player Digging
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_DIGGING, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.POSITION1_8);
|
||||
handler(packetWrapper -> {
|
||||
int state = packetWrapper.get(Type.VAR_INT, 0);
|
||||
if (state == 0) {
|
||||
packetWrapper.user().get(BlockPlaceDestroyTracker.class).setMining(true);
|
||||
} else if (state == 2) {
|
||||
BlockPlaceDestroyTracker tracker = packetWrapper.user().get(BlockPlaceDestroyTracker.class);
|
||||
tracker.setMining(false);
|
||||
tracker.setLastMining(System.currentTimeMillis() + 100);
|
||||
packetWrapper.user().get(Cooldown.class).setLastHit(0);
|
||||
} else if (state == 1) {
|
||||
BlockPlaceDestroyTracker tracker = packetWrapper.user().get(BlockPlaceDestroyTracker.class);
|
||||
tracker.setMining(false);
|
||||
tracker.setLastMining(0);
|
||||
packetWrapper.user().get(Cooldown.class).hit();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player Block Placement
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.BYTE, Type.VAR_INT);
|
||||
read(Type.ITEM1_8);
|
||||
create(Type.VAR_INT, 0); //Main Hand
|
||||
map(Type.BYTE, Type.UNSIGNED_BYTE);
|
||||
map(Type.BYTE, Type.UNSIGNED_BYTE);
|
||||
map(Type.BYTE, Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
if (packetWrapper.get(Type.VAR_INT, 0) == -1) {
|
||||
packetWrapper.cancel();
|
||||
PacketWrapper useItem = PacketWrapper.create(0x1D, null, packetWrapper.user());
|
||||
useItem.write(Type.VAR_INT, 0);
|
||||
|
||||
PacketUtil.sendToServer(useItem, Protocol1_8To1_9.class, true, true);
|
||||
}
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
if (packetWrapper.get(Type.VAR_INT, 0) != -1) {
|
||||
packetWrapper.user().get(BlockPlaceDestroyTracker.class).place();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Held Item Change
|
||||
protocol.registerServerbound(ServerboundPackets1_8.HELD_ITEM_CHANGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> packetWrapper.user().get(Cooldown.class).hit());
|
||||
}
|
||||
});
|
||||
|
||||
//Animation
|
||||
protocol.registerServerbound(ServerboundPackets1_8.ANIMATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.cancel();
|
||||
|
||||
/* We have to add ArmAnimation to a queue to be sent on PacketPlayInFlying. In 1.9,
|
||||
* PacketPlayInArmAnimation is sent after PacketPlayInUseEntity, not before like it used to be.
|
||||
* However, all packets are sent before PacketPlayInFlying. We'd just do a normal delay, but
|
||||
* it would cause the packet to be sent after PacketPlayInFlying, potentially false flagging
|
||||
* anticheats that check for this behavior from clients. Since all packets are sent before
|
||||
* PacketPlayInFlying, if we queue it to be sent right before PacketPlayInFlying is processed,
|
||||
* we can be certain it will be sent after PacketPlayInUseEntity */
|
||||
packetWrapper.cancel();
|
||||
final PacketWrapper delayedPacket = PacketWrapper.create(0x1A,
|
||||
null, packetWrapper.user());
|
||||
delayedPacket.write(Type.VAR_INT, 0); //Main Hand
|
||||
|
||||
((Protocol1_8To1_9) protocol).animationsToSend.add(delayedPacket);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
packetWrapper.user().get(BlockPlaceDestroyTracker.class).updateMining();
|
||||
packetWrapper.user().get(Cooldown.class).hit();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Entity Action
|
||||
protocol.registerServerbound(ServerboundPackets1_8.ENTITY_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.VAR_INT);
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int action = packetWrapper.get(Type.VAR_INT, 1);
|
||||
if (action == 6) {
|
||||
packetWrapper.set(Type.VAR_INT, 1, 7);
|
||||
} else if (action == 0) {
|
||||
PlayerPosition pos = packetWrapper.user().get(PlayerPosition.class);
|
||||
if (!pos.isOnGround()) {
|
||||
PacketWrapper elytra = PacketWrapper.create(0x14, null, packetWrapper.user());
|
||||
elytra.write(Type.VAR_INT, packetWrapper.get(Type.VAR_INT, 0));
|
||||
elytra.write(Type.VAR_INT, 8);
|
||||
elytra.write(Type.VAR_INT, 0);
|
||||
PacketUtil.sendToServer(elytra, Protocol1_8To1_9.class, true, false);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Steer Vehicle
|
||||
protocol.registerServerbound(ServerboundPackets1_8.STEER_VEHICLE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.FLOAT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
int playerId = tracker.getPlayerId();
|
||||
int vehicle = tracker.getVehicle(playerId);
|
||||
if (vehicle != -1 && tracker.getClientEntityTypes().get(vehicle) == EntityTypes1_10.EntityType.BOAT) {
|
||||
PacketWrapper steerBoat = PacketWrapper.create(0x11, null, packetWrapper.user());
|
||||
float left = packetWrapper.get(Type.FLOAT, 0);
|
||||
float forward = packetWrapper.get(Type.FLOAT, 1);
|
||||
steerBoat.write(Type.BOOLEAN, forward != 0.0f || left < 0.0f);
|
||||
steerBoat.write(Type.BOOLEAN, forward != 0.0f || left > 0.0f);
|
||||
PacketUtil.sendToServer(steerBoat, Protocol1_8To1_9.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Update Sign
|
||||
protocol.registerServerbound(ServerboundPackets1_8.UPDATE_SIGN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8);
|
||||
handler(packetWrapper -> {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
packetWrapper.write(Type.STRING, ChatUtil.jsonToLegacy(packetWrapper.read(Type.COMPONENT)));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Player Abilities
|
||||
|
||||
//Tab Complete
|
||||
protocol.registerServerbound(ServerboundPackets1_8.TAB_COMPLETE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> packetWrapper.write(Type.BOOLEAN, false));
|
||||
map(Type.OPTIONAL_POSITION1_8);
|
||||
}
|
||||
});
|
||||
|
||||
//Client Settings
|
||||
protocol.registerServerbound(ServerboundPackets1_8.CLIENT_SETTINGS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE, Type.VAR_INT);
|
||||
map(Type.BOOLEAN);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
create(Type.VAR_INT, 1);
|
||||
handler(packetWrapper -> {
|
||||
short flags = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
|
||||
PacketWrapper updateSkin = PacketWrapper.create(0x1C, null, packetWrapper.user());
|
||||
updateSkin.write(Type.VAR_INT, packetWrapper.user().get(EntityTracker.class).getPlayerId());
|
||||
|
||||
ArrayList<Metadata> metadata = new ArrayList<>();
|
||||
metadata.add(new Metadata(10, MetaType1_8.Byte, (byte) flags));
|
||||
|
||||
updateSkin.write(Types1_8.METADATA_LIST, metadata);
|
||||
|
||||
PacketUtil.sendPacket(updateSkin, Protocol1_8To1_9.class);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Client Status
|
||||
|
||||
//Custom Payload
|
||||
protocol.registerServerbound(ServerboundPackets1_8.PLUGIN_MESSAGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String channel = packetWrapper.get(Type.STRING, 0);
|
||||
if (channel.equals("MC|BEdit") || channel.equals("MC|BSign")) {
|
||||
Item book = packetWrapper.passthrough(Type.ITEM);
|
||||
book.setIdentifier(386);
|
||||
CompoundTag tag = book.tag();
|
||||
if (tag.contains("pages")) {
|
||||
ListTag pages = tag.get("pages");
|
||||
if (pages.size() > ViaRewind.getConfig().getMaxBookPages()) {
|
||||
packetWrapper.user().disconnect("Too many book pages");
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < pages.size(); i++) {
|
||||
StringTag page = pages.get(i);
|
||||
String value = page.getValue();
|
||||
if (value.length() > ViaRewind.getConfig().getMaxBookPageSize()) {
|
||||
packetWrapper.user().disconnect("Book page too large");
|
||||
return;
|
||||
}
|
||||
value = ChatUtil.jsonToLegacy(value);
|
||||
page.setValue(value);
|
||||
}
|
||||
}
|
||||
} else if (channel.equals("MC|AdvCdm")) {
|
||||
packetWrapper.set(Type.STRING, 0, channel = "MC|AdvCmd");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spectate
|
||||
//Resource Pack Status
|
||||
}
|
||||
}
|
||||
-65
@@ -1,65 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viaversion.api.protocol.Protocol;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ServerboundPackets1_9;
|
||||
|
||||
public class ScoreboardPackets {
|
||||
|
||||
public static void register(Protocol<ClientboundPackets1_9, ClientboundPackets1_8,
|
||||
ServerboundPackets1_9, ServerboundPackets1_8> protocol) {
|
||||
/* OUTGOING */
|
||||
|
||||
//Display Scoreboard
|
||||
//Scoreboard Objective
|
||||
|
||||
//Scoreboard Team
|
||||
protocol.registerClientbound(ClientboundPackets1_9.TEAMS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> {
|
||||
byte mode = packetWrapper.get(Type.BYTE, 0);
|
||||
if (mode == 0 || mode == 2) {
|
||||
packetWrapper.passthrough(Type.STRING); //Display Name
|
||||
packetWrapper.passthrough(Type.STRING); //Prefix
|
||||
packetWrapper.passthrough(Type.STRING); //Suffix
|
||||
packetWrapper.passthrough(Type.BYTE); //Friendly Flags
|
||||
packetWrapper.passthrough(Type.STRING); //Name Tag Visibility
|
||||
packetWrapper.read(Type.STRING); //Skip Collision Rule
|
||||
packetWrapper.passthrough(Type.BYTE); //Friendly Flags
|
||||
}
|
||||
|
||||
if (mode == 0 || mode == 3 || mode == 4) {
|
||||
packetWrapper.passthrough(Type.STRING_ARRAY);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Update Score
|
||||
}
|
||||
}
|
||||
-272
@@ -1,272 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.entityreplacement.ShulkerBulletModel;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.entityreplacement.ShulkerModel;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
|
||||
import com.viaversion.viarewind.api.minecraft.EntityModel;
|
||||
import com.viaversion.viarewind.api.rewriter.Replacement;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_9;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SpawnPackets {
|
||||
|
||||
public static void register(Protocol1_8To1_9 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
read(Type.UUID);
|
||||
map(Type.BYTE);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.INT);
|
||||
|
||||
handler(packetWrapper -> {
|
||||
final int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
final int typeId = packetWrapper.get(Type.BYTE, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
final EntityTypes1_10.EntityType type = EntityTypes1_10.getTypeFromId(typeId, true);
|
||||
|
||||
//cancel AREA_EFFECT_CLOUD = 3, SPECTRAL_ARROW = 91, DRAGON_FIREBALL = 93
|
||||
if (typeId == 3 || typeId == 91 || typeId == 92 || typeId == 93) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
if (type == null) {
|
||||
ViaRewind.getPlatform().getLogger().warning("[ViaRewind] Unhandled Spawn Object Type: " + typeId);
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
int x = packetWrapper.get(Type.INT, 0);
|
||||
int y = packetWrapper.get(Type.INT, 1);
|
||||
int z = packetWrapper.get(Type.INT, 2);
|
||||
|
||||
if (type.is(EntityTypes1_10.EntityType.BOAT)) {
|
||||
byte yaw = packetWrapper.get(Type.BYTE, 1);
|
||||
yaw -= 64;
|
||||
packetWrapper.set(Type.BYTE, 1, yaw);
|
||||
y += 10;
|
||||
packetWrapper.set(Type.INT, 1, y);
|
||||
} else if (type.is(EntityTypes1_10.EntityType.SHULKER_BULLET)) {
|
||||
packetWrapper.cancel();
|
||||
ShulkerBulletModel shulkerBulletReplacement = new ShulkerBulletModel(packetWrapper.user(), protocol, entityId);
|
||||
shulkerBulletReplacement.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
tracker.addEntityReplacement(shulkerBulletReplacement);
|
||||
return;
|
||||
}
|
||||
|
||||
int data = packetWrapper.get(Type.INT, 3);
|
||||
|
||||
//Rewrite Object Data
|
||||
if (type.isOrHasParent(EntityTypes1_10.EntityType.ARROW) && data != 0) {
|
||||
packetWrapper.set(Type.INT, 3, --data);
|
||||
}
|
||||
if (type.is(EntityTypes1_10.EntityType.FALLING_BLOCK)) {
|
||||
int blockId = data & 0xFFF;
|
||||
int blockData = data >> 12 & 0xF;
|
||||
Replacement replace = protocol.getItemRewriter().replace(blockId, blockData);
|
||||
if (replace != null) {
|
||||
packetWrapper.set(Type.INT, 3, replace.getId() | replace.replaceData(data) << 12);
|
||||
}
|
||||
}
|
||||
|
||||
if (data > 0) {
|
||||
packetWrapper.passthrough(Type.SHORT);
|
||||
packetWrapper.passthrough(Type.SHORT);
|
||||
packetWrapper.passthrough(Type.SHORT);
|
||||
} else {
|
||||
short vX = packetWrapper.read(Type.SHORT);
|
||||
short vY = packetWrapper.read(Type.SHORT);
|
||||
short vZ = packetWrapper.read(Type.SHORT);
|
||||
PacketWrapper velocityPacket = PacketWrapper.create(0x12, null, packetWrapper.user());
|
||||
velocityPacket.write(Type.VAR_INT, entityId);
|
||||
velocityPacket.write(Type.SHORT, vX);
|
||||
velocityPacket.write(Type.SHORT, vY);
|
||||
velocityPacket.write(Type.SHORT, vZ);
|
||||
PacketUtil.sendPacket(velocityPacket, Protocol1_8To1_9.class);
|
||||
}
|
||||
|
||||
tracker.getClientEntityTypes().put(entityId, type);
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spawn Experience Orb
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_EXPERIENCE_ORB, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.SHORT);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.getClientEntityTypes().put(entityId, EntityTypes1_10.EntityType.EXPERIENCE_ORB);
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spawn Global Entity
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_GLOBAL_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.getClientEntityTypes().put(entityId, EntityTypes1_10.EntityType.LIGHTNING);
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spawn Mob
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_MOB, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
read(Type.UUID);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
map(Type.SHORT);
|
||||
map(Type.SHORT);
|
||||
map(Type.SHORT);
|
||||
map(Types1_9.METADATA_LIST, Types1_8.METADATA_LIST);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
int typeId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
int x = packetWrapper.get(Type.INT, 0);
|
||||
int y = packetWrapper.get(Type.INT, 1);
|
||||
int z = packetWrapper.get(Type.INT, 2);
|
||||
byte pitch = packetWrapper.get(Type.BYTE, 1);
|
||||
byte yaw = packetWrapper.get(Type.BYTE, 0);
|
||||
byte headYaw = packetWrapper.get(Type.BYTE, 2);
|
||||
|
||||
if (typeId == 69) {
|
||||
packetWrapper.cancel();
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
ShulkerModel shulkerReplacement = new ShulkerModel(packetWrapper.user(), protocol, entityId);
|
||||
shulkerReplacement.updateReplacementPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
shulkerReplacement.setYawPitch(yaw * 360f / 256, pitch * 360f / 256);
|
||||
shulkerReplacement.setHeadYaw(headYaw * 360f / 256);
|
||||
tracker.addEntityReplacement(shulkerReplacement);
|
||||
} else if (typeId == -1 || typeId == 255) {
|
||||
packetWrapper.cancel();
|
||||
}
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
int typeId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.getClientEntityTypes().put(entityId, EntityTypes1_10.getTypeFromId(typeId, false));
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
handler(wrapper -> {
|
||||
List<Metadata> metadataList = wrapper.get(Types1_8.METADATA_LIST, 0);
|
||||
int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = wrapper.user().get(EntityTracker.class);
|
||||
EntityModel replacement;
|
||||
if ((replacement = tracker.getEntityReplacement(entityId)) != null) {
|
||||
replacement.updateMetadata(metadataList);
|
||||
} else if (tracker.getClientEntityTypes().containsKey(entityId)) {
|
||||
protocol.getMetadataRewriter().transform(tracker, entityId, metadataList);
|
||||
} else {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spawn Painting
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_PAINTING, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
read(Type.UUID);
|
||||
map(Type.STRING);
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.BYTE, Type.UNSIGNED_BYTE);
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.getClientEntityTypes().put(entityId, EntityTypes1_10.EntityType.PAINTING);
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Spawn Player
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_PLAYER, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.UUID);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.DOUBLE, Protocol1_8To1_9.TO_OLD_INT);
|
||||
map(Type.BYTE);
|
||||
map(Type.BYTE);
|
||||
handler(packetWrapper -> packetWrapper.write(Type.SHORT, (short) 0));
|
||||
map(Types1_9.METADATA_LIST, Types1_8.METADATA_LIST);
|
||||
this.handler(wrapper -> {
|
||||
int entityId = wrapper.get(Type.VAR_INT, 0);
|
||||
List<Metadata> metadataList = wrapper.get(Types1_8.METADATA_LIST, 0);
|
||||
protocol.getMetadataRewriter().transform(wrapper.user().get(EntityTracker.class), entityId, metadataList, EntityTypes1_10.EntityType.PLAYER);
|
||||
});
|
||||
handler(packetWrapper -> {
|
||||
int entityId = packetWrapper.get(Type.VAR_INT, 0);
|
||||
EntityTracker tracker = packetWrapper.user().get(EntityTracker.class);
|
||||
tracker.getClientEntityTypes().put(entityId, EntityTypes1_10.EntityType.PLAYER);
|
||||
tracker.sendMetadataBuffer(entityId);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-317
@@ -1,317 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.packets;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.sound.Effect;
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.sound.SoundRemapper;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
|
||||
import com.viaversion.viaversion.api.minecraft.Environment;
|
||||
import com.viaversion.viaversion.api.minecraft.Position;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_8;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_1;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ClientboundPackets1_9;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class WorldPackets {
|
||||
|
||||
public static void register(Protocol1_8To1_9 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_9.BLOCK_ENTITY_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.NAMED_COMPOUND_TAG);
|
||||
handler(packetWrapper -> {
|
||||
CompoundTag tag = packetWrapper.get(Type.NAMED_COMPOUND_TAG, 0);
|
||||
if (tag != null && tag.contains("SpawnData")) {
|
||||
CompoundTag spawnData = tag.get("SpawnData");
|
||||
if (spawnData.contains("id")) {
|
||||
String entity = (String) spawnData.get("id").getValue();
|
||||
tag.remove("SpawnData");
|
||||
tag.put("entityId", new StringTag(entity));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Block Action
|
||||
protocol.registerClientbound(ClientboundPackets1_9.BLOCK_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int block = packetWrapper.get(Type.VAR_INT, 0);
|
||||
if (block >= 219 && block <= 234) {
|
||||
packetWrapper.set(Type.VAR_INT, 0, block = 130);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Block Change
|
||||
protocol.registerClientbound(ClientboundPackets1_9.BLOCK_CHANGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.VAR_INT);
|
||||
handler(packetWrapper -> {
|
||||
int combined = packetWrapper.get(Type.VAR_INT, 0);
|
||||
int replacedCombined = protocol.getItemRewriter().replace(combined);
|
||||
packetWrapper.set(Type.VAR_INT, 0, replacedCombined);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Server Difficulty
|
||||
|
||||
//Multi Block Change
|
||||
protocol.registerClientbound(ClientboundPackets1_9.MULTI_BLOCK_CHANGE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
map(Type.BLOCK_CHANGE_RECORD_ARRAY);
|
||||
handler(packetWrapper -> {
|
||||
for (BlockChangeRecord record : packetWrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) {
|
||||
int replacedCombined = protocol.getItemRewriter().replace(record.getBlockId());
|
||||
record.setBlockId(replacedCombined);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Named Sound Effect
|
||||
protocol.registerClientbound(ClientboundPackets1_9.NAMED_SOUND, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING);
|
||||
handler(packetWrapper -> {
|
||||
String name = packetWrapper.get(Type.STRING, 0);
|
||||
name = SoundRemapper.getOldName(name);
|
||||
if (name == null) {
|
||||
packetWrapper.cancel();
|
||||
} else {
|
||||
packetWrapper.set(Type.STRING, 0, name);
|
||||
}
|
||||
});
|
||||
read(Type.VAR_INT);
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
}
|
||||
});
|
||||
|
||||
//Unload Chunk
|
||||
protocol.registerClientbound(ClientboundPackets1_9.UNLOAD_CHUNK, ClientboundPackets1_8.CHUNK_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
final Environment environment = packetWrapper.user().get(ClientWorld.class).getEnvironment();
|
||||
|
||||
final int chunkX = packetWrapper.read(Type.INT);
|
||||
final int chunkZ = packetWrapper.read(Type.INT);
|
||||
|
||||
packetWrapper.write(ChunkType1_8.forEnvironment(environment), new BaseChunk(chunkX, chunkZ, true, false, 0, new ChunkSection[16], null, new ArrayList<>()));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Chunk Data
|
||||
protocol.registerClientbound(ClientboundPackets1_9.CHUNK_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
final Environment environment = packetWrapper.user().get(ClientWorld.class).getEnvironment();
|
||||
|
||||
Chunk chunk = packetWrapper.read(ChunkType1_9_1.forEnvironment(environment));
|
||||
|
||||
for (ChunkSection section : chunk.getSections()) {
|
||||
if (section == null) continue;
|
||||
DataPalette palette = section.palette(PaletteType.BLOCKS);
|
||||
for (int i = 0; i < palette.size(); i++) {
|
||||
int block = palette.idByIndex(i);
|
||||
int replacedBlock = protocol.getItemRewriter().replace(block);
|
||||
palette.setIdByIndex(i, replacedBlock);
|
||||
}
|
||||
}
|
||||
|
||||
if (chunk.isFullChunk() && chunk.getBitmask() == 0) { //This would be an unload packet for 1.8 clients. Just set one air section
|
||||
boolean skylight = environment == Environment.NORMAL;
|
||||
ChunkSection[] sections = new ChunkSection[16];
|
||||
ChunkSection section = new ChunkSectionImpl(true);
|
||||
sections[0] = section;
|
||||
section.palette(PaletteType.BLOCKS).addId(0);
|
||||
if (skylight) section.getLight().setSkyLight(new byte[2048]);
|
||||
chunk = new BaseChunk(chunk.getX(), chunk.getZ(), true, false, 1, sections, chunk.getBiomeData(), chunk.getBlockEntities());
|
||||
}
|
||||
|
||||
packetWrapper.write(ChunkType1_8.forEnvironment(environment), chunk);
|
||||
|
||||
final UserConnection user = packetWrapper.user();
|
||||
chunk.getBlockEntities().forEach(nbt -> {
|
||||
if (!nbt.contains("x") || !nbt.contains("y") || !nbt.contains("z") || !nbt.contains("id"))
|
||||
return;
|
||||
Position position = new Position((int) nbt.get("x").getValue(), (int) nbt.get("y").getValue(), (int) nbt.get("z").getValue());
|
||||
String id = (String) nbt.get("id").getValue();
|
||||
|
||||
short action;
|
||||
switch (id) {
|
||||
case "minecraft:mob_spawner":
|
||||
action = 1;
|
||||
break;
|
||||
case "minecraft:command_block":
|
||||
action = 2;
|
||||
break;
|
||||
case "minecraft:beacon":
|
||||
action = 3;
|
||||
break;
|
||||
case "minecraft:skull":
|
||||
action = 4;
|
||||
break;
|
||||
case "minecraft:flower_pot":
|
||||
action = 5;
|
||||
break;
|
||||
case "minecraft:banner":
|
||||
action = 6;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
PacketWrapper updateTileEntity = PacketWrapper.create(0x09, null, user);
|
||||
updateTileEntity.write(Type.POSITION1_8, position);
|
||||
updateTileEntity.write(Type.UNSIGNED_BYTE, action);
|
||||
updateTileEntity.write(Type.NBT, nbt);
|
||||
|
||||
PacketUtil.sendPacket(updateTileEntity, Protocol1_8To1_9.class, false, false);
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Effect
|
||||
protocol.registerClientbound(ClientboundPackets1_9.EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
map(Type.POSITION1_8);
|
||||
map(Type.INT);
|
||||
map(Type.BOOLEAN);
|
||||
handler(packetWrapper -> {
|
||||
int id = packetWrapper.get(Type.INT, 0);
|
||||
id = Effect.getOldId(id);
|
||||
if (id == -1) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
packetWrapper.set(Type.INT, 0, id);
|
||||
if (id == 2001) {
|
||||
int replacedBlock = protocol.getItemRewriter().replace(packetWrapper.get(Type.INT, 1));
|
||||
packetWrapper.set(Type.INT, 1, replacedBlock);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Particle
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SPAWN_PARTICLE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT);
|
||||
handler(packetWrapper -> {
|
||||
int type = packetWrapper.get(Type.INT, 0);
|
||||
if (type > 41 && !ViaRewind.getConfig().isReplaceParticles()) {
|
||||
packetWrapper.cancel();
|
||||
return;
|
||||
}
|
||||
if (type == 42) { // Dragon Breath
|
||||
packetWrapper.set(Type.INT, 0, 24); // Portal
|
||||
} else if (type == 43) { // End Rod
|
||||
packetWrapper.set(Type.INT, 0, 3); // Firework Spark
|
||||
} else if (type == 44) { // Damage Indicator
|
||||
packetWrapper.set(Type.INT, 0, 34); // Heart
|
||||
} else if (type == 45) { // Sweep Attack
|
||||
packetWrapper.set(Type.INT, 0, 1); // Large Explosion
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//Map
|
||||
protocol.registerClientbound(ClientboundPackets1_9.MAP_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT);
|
||||
map(Type.BYTE);
|
||||
read(Type.BOOLEAN);
|
||||
}
|
||||
});
|
||||
|
||||
//Combat Event
|
||||
//World Border
|
||||
//Update Time
|
||||
//Update Sign
|
||||
|
||||
//Sound Effects
|
||||
protocol.registerClientbound(ClientboundPackets1_9.SOUND, ClientboundPackets1_8.NAMED_SOUND, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(packetWrapper -> {
|
||||
int soundId = packetWrapper.read(Type.VAR_INT);
|
||||
String sound = SoundRemapper.oldNameFromId(soundId);
|
||||
if (sound == null) {
|
||||
packetWrapper.cancel();
|
||||
} else {
|
||||
packetWrapper.write(Type.STRING, sound);
|
||||
}
|
||||
});
|
||||
handler(packetWrapper -> packetWrapper.read(Type.VAR_INT));
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
map(Type.INT);
|
||||
map(Type.FLOAT);
|
||||
map(Type.UNSIGNED_BYTE);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
-314
@@ -1,314 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.api.rewriter.Replacement;
|
||||
import com.viaversion.viarewind.api.rewriter.ReplacementItemRewriter;
|
||||
import com.viaversion.viarewind.utils.Enchantments;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
|
||||
import com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static com.viaversion.viaversion.protocols.protocol1_9to1_8.ItemRewriter.potionNameFromDamage;
|
||||
|
||||
public class ReplacementItemRewriter1_8 extends ReplacementItemRewriter<Protocol1_8To1_9> {
|
||||
public final static String VIA_REWIND_TAG_KEY = "ViaRewind1_8to1_9";
|
||||
|
||||
public ReplacementItemRewriter1_8(Protocol1_8To1_9 protocol) {
|
||||
super(protocol, ProtocolVersion.v1_9);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void register() {
|
||||
registerItem(198, new Replacement(50, 0, "End Rod"));
|
||||
registerItem(434, new Replacement(391, "Beetroot"));
|
||||
registerItem(435, new Replacement(361, "Beetroot Seeds"));
|
||||
registerItem(436, new Replacement(282, "Beetroot Soup"));
|
||||
registerItem(432, new Replacement(322, "Chorus Fruit"));
|
||||
registerItem(433, new Replacement(393, "Popped Chorus Fruit"));
|
||||
registerItem(437, new Replacement(373, "Dragons Breath"));
|
||||
registerItem(443, new Replacement(299, "Elytra"));
|
||||
registerItem(426, new Replacement(410, "End Crystal"));
|
||||
registerItem(442, new Replacement(425, "Shield"));
|
||||
registerItem(439, new Replacement(262, "Spectral Arrow"));
|
||||
registerItem(440, new Replacement(262, "Tipped Arrow"));
|
||||
registerItem(444, new Replacement(333, "Spruce Boat"));
|
||||
registerItem(445, new Replacement(333, "Birch Boat"));
|
||||
registerItem(446, new Replacement(333, "Jungle Boat"));
|
||||
registerItem(447, new Replacement(333, "Acacia Boat"));
|
||||
registerItem(448, new Replacement(333, "Dark Oak Boat"));
|
||||
registerItem(204, new Replacement(43, 7, "Purpur Double Slab"));
|
||||
registerItem(205, new Replacement(44, 7, "Purpur Slab"));
|
||||
|
||||
registerBlock(209, new Replacement(119));
|
||||
registerBlock(198, 0, new Replacement(50, 5));
|
||||
registerBlock(198, 1, new Replacement(50, 5));
|
||||
registerBlock(198, 2, new Replacement(50, 4));
|
||||
registerBlock(198, 3, new Replacement(50, 3));
|
||||
registerBlock(198, 4, new Replacement(50, 2));
|
||||
registerBlock(198, 5, new Replacement(50, 1));
|
||||
registerBlock(204, new Replacement(43, 7));
|
||||
registerBlock(205, 0, new Replacement(44, 7));
|
||||
registerBlock(205, 8, new Replacement(44, 15));
|
||||
registerBlock(207, new Replacement(141));
|
||||
registerBlock(137, new Replacement(137, 0));
|
||||
|
||||
registerItemBlock(199, new Replacement(35, 10, "Chorus Plant"));
|
||||
registerItemBlock(200, new Replacement(35, 2, "Chorus Flower"));
|
||||
registerItemBlock(201, new Replacement(155, 0, "Purpur Block"));
|
||||
registerItemBlock(202, new Replacement(155, 2, "Purpur Pillar"));
|
||||
registerItemBlock(203, 0, new Replacement(156, 0, "Purpur Stairs"));
|
||||
registerItemBlock(203, 1, new Replacement(156, 1, "Purpur Stairs"));
|
||||
registerItemBlock(203, 2, new Replacement(156, 2, "Purpur Stairs"));
|
||||
registerItemBlock(203, 3, new Replacement(156, 3, "Purpur Stairs"));
|
||||
registerItemBlock(203, 4, new Replacement(156, 4, "Purpur Stairs"));
|
||||
registerItemBlock(203, 5, new Replacement(156, 5, "Purpur Stairs"));
|
||||
registerItemBlock(203, 6, new Replacement(156, 6, "Purpur Stairs"));
|
||||
registerItemBlock(203, 7, new Replacement(156, 7, "Purpur Stairs"));
|
||||
registerItemBlock(203, 8, new Replacement(156, 8, "Purpur Stairs"));
|
||||
registerItemBlock(206, new Replacement(121, 0, "Endstone Bricks"));
|
||||
registerItemBlock(207, new Replacement(141, "Beetroot Block"));
|
||||
registerItemBlock(208, new Replacement(2, 0, "Grass Path"));
|
||||
registerItemBlock(209, new Replacement(90, "End Gateway"));
|
||||
registerItemBlock(210, new Replacement(137, 0, "Repeating Command Block"));
|
||||
registerItemBlock(211, new Replacement(137, 0, "Chain Command Block"));
|
||||
registerItemBlock(212, new Replacement(79, 0, "Frosted Ice"));
|
||||
registerItemBlock(214, new Replacement(87, 0, "Nether Wart Block"));
|
||||
registerItemBlock(215, new Replacement(112, 0, "Red Nether Brick"));
|
||||
registerItemBlock(217, new Replacement(166, 0, "Structure Void"));
|
||||
registerItemBlock(255, new Replacement(137, 0, "Structure Block"));
|
||||
registerItemBlock(397, 5, new Replacement(397, 0, "Dragon Head"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToClient(Item item) {
|
||||
if (item == null) return null;
|
||||
|
||||
CompoundTag tag = item.tag();
|
||||
if (tag == null) item.setTag(tag = new CompoundTag());
|
||||
|
||||
CompoundTag viaVersionTag = new CompoundTag();
|
||||
tag.put(VIA_REWIND_TAG_KEY, viaVersionTag);
|
||||
|
||||
viaVersionTag.put("id", new ShortTag((short) item.identifier()));
|
||||
viaVersionTag.put("data", new ShortTag(item.data()));
|
||||
|
||||
CompoundTag display = tag.get("display");
|
||||
if (display != null && display.contains("Name")) {
|
||||
viaVersionTag.put("displayName", new StringTag((String) display.get("Name").getValue()));
|
||||
}
|
||||
|
||||
if (display != null && display.contains("Lore")) {
|
||||
viaVersionTag.put("lore", new ListTag(((ListTag) display.get("Lore")).getValue()));
|
||||
}
|
||||
|
||||
if (tag.contains("ench") || tag.contains("StoredEnchantments")) {
|
||||
ListTag enchTag = tag.contains("ench") ? tag.get("ench") : tag.get("StoredEnchantments");
|
||||
List<Tag> lore = new ArrayList<>();
|
||||
for (Tag ench : new ArrayList<>(enchTag.getValue())) {
|
||||
short id = ((NumberTag) ((CompoundTag) ench).get("id")).asShort();
|
||||
short lvl = ((NumberTag) ((CompoundTag) ench).get("lvl")).asShort();
|
||||
String s;
|
||||
if (id == 70) {
|
||||
s = "§r§7Mending ";
|
||||
} else if (id == 9) {
|
||||
s = "§r§7Frost Walker ";
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
enchTag.remove(ench);
|
||||
s += Enchantments.ENCHANTMENTS.getOrDefault(lvl, "enchantment.level." + lvl);
|
||||
lore.add(new StringTag(s));
|
||||
}
|
||||
if (!lore.isEmpty()) {
|
||||
if (display == null) {
|
||||
tag.put("display", display = new CompoundTag());
|
||||
viaVersionTag.put("noDisplay", new ByteTag());
|
||||
}
|
||||
ListTag loreTag = display.get("Lore");
|
||||
if (loreTag == null) display.put("Lore", loreTag = new ListTag(StringTag.class));
|
||||
lore.addAll(loreTag.getValue());
|
||||
loreTag.setValue(lore);
|
||||
}
|
||||
}
|
||||
|
||||
if (item.data() != 0 && tag.contains("Unbreakable")) {
|
||||
ByteTag unbreakable = tag.get("Unbreakable");
|
||||
if (unbreakable.asByte() != 0) {
|
||||
viaVersionTag.put("Unbreakable", new ByteTag(unbreakable.asByte()));
|
||||
tag.remove("Unbreakable");
|
||||
|
||||
if (display == null) {
|
||||
tag.put("display", display = new CompoundTag());
|
||||
viaVersionTag.put("noDisplay", new ByteTag());
|
||||
}
|
||||
ListTag loreTag = display.get("Lore");
|
||||
if (loreTag == null) display.put("Lore", loreTag = new ListTag(StringTag.class));
|
||||
loreTag.add(new StringTag("§9Unbreakable"));
|
||||
}
|
||||
}
|
||||
|
||||
if (tag.contains("AttributeModifiers")) {
|
||||
viaVersionTag.put("AttributeModifiers", tag.get("AttributeModifiers").copy());
|
||||
}
|
||||
|
||||
if (item.identifier() == 383 && item.data() == 0) {
|
||||
int data = 0;
|
||||
if (tag.contains("EntityTag")) {
|
||||
CompoundTag entityTag = tag.get("EntityTag");
|
||||
if (entityTag.contains("id")) {
|
||||
StringTag id = entityTag.get("id");
|
||||
if (ItemRewriter.ENTITY_NAME_TO_ID.containsKey(id.getValue())) {
|
||||
data = ItemRewriter.ENTITY_NAME_TO_ID.get(id.getValue());
|
||||
} else if (display == null) {
|
||||
tag.put("display", display = new CompoundTag());
|
||||
viaVersionTag.put("noDisplay", new ByteTag());
|
||||
display.put("Name", new StringTag("§rSpawn " + id.getValue()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
item.setData((short) data);
|
||||
}
|
||||
|
||||
replace(item);
|
||||
|
||||
if (item.identifier() == 373 || item.identifier() == 438 || item.identifier() == 441) {
|
||||
int data = 0;
|
||||
if (tag.contains("Potion")) {
|
||||
StringTag potion = tag.get("Potion");
|
||||
String potionName = potion.getValue().replace("minecraft:", "");
|
||||
if (PotionMappings.POTION_NAME_TO_ID.containsKey(potionName)) {
|
||||
data = PotionMappings.POTION_NAME_TO_ID.get(potionName);
|
||||
}
|
||||
if (item.identifier() == 438) potionName += "_splash";
|
||||
else if (item.identifier() == 441) potionName += "_lingering";
|
||||
if ((display == null || !display.contains("Name")) && PotionMappings.POTION_NAME_INDEX.containsKey(potionName)) {
|
||||
if (display == null) {
|
||||
tag.put("display", display = new CompoundTag());
|
||||
viaVersionTag.put("noDisplay", new ByteTag());
|
||||
}
|
||||
display.put("Name", new StringTag(PotionMappings.POTION_NAME_INDEX.get(potionName)));
|
||||
}
|
||||
}
|
||||
|
||||
if (item.identifier() == 438 || item.identifier() == 441) {
|
||||
item.setIdentifier(373);
|
||||
data += 8192;
|
||||
}
|
||||
|
||||
item.setData((short) data);
|
||||
}
|
||||
|
||||
if (tag.contains("AttributeModifiers")) {
|
||||
ListTag attributes = tag.get("AttributeModifiers");
|
||||
for (int i = 0; i < attributes.size(); i++) {
|
||||
CompoundTag attribute = attributes.get(i);
|
||||
String name = (String) attribute.get("AttributeName").getValue();
|
||||
if (!Protocol1_8To1_9.VALID_ATTRIBUTES.contains(name)) {
|
||||
attributes.remove(attribute);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (viaVersionTag.size() == 2 && (short) viaVersionTag.get("id").getValue() == item.identifier() && (short) viaVersionTag.get("data").getValue() == item.data()) {
|
||||
item.tag().remove(VIA_REWIND_TAG_KEY);
|
||||
if (item.tag().isEmpty()) item.setTag(null);
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToServer(Item item) {
|
||||
if (item == null) return null;
|
||||
|
||||
CompoundTag tag = item.tag();
|
||||
|
||||
if (item.identifier() == 383 && item.data() != 0) {
|
||||
if (tag == null) item.setTag(tag = new CompoundTag());
|
||||
if (!tag.contains("EntityTag") && ItemRewriter.ENTITY_ID_TO_NAME.containsKey((int) item.data())) {
|
||||
CompoundTag entityTag = new CompoundTag();
|
||||
entityTag.put("id", new StringTag(ItemRewriter.ENTITY_ID_TO_NAME.get((int) item.data())));
|
||||
tag.put("EntityTag", entityTag);
|
||||
}
|
||||
|
||||
item.setData((short) 0);
|
||||
}
|
||||
|
||||
if (item.identifier() == 373 && (tag == null || !tag.contains("Potion"))) {
|
||||
if (tag == null) item.setTag(tag = new CompoundTag());
|
||||
|
||||
if (item.data() >= 16384) {
|
||||
item.setIdentifier(438);
|
||||
item.setData((short) (item.data() - 8192));
|
||||
}
|
||||
|
||||
String name = item.data() == 8192 ? "water" : potionNameFromDamage(item.data());
|
||||
tag.put("Potion", new StringTag("minecraft:" + name));
|
||||
item.setData((short) 0);
|
||||
}
|
||||
|
||||
if (tag == null || !item.tag().contains("ViaRewind1_8to1_9")) return item;
|
||||
|
||||
CompoundTag viaVersionTag = tag.remove("ViaRewind1_8to1_9");
|
||||
|
||||
item.setIdentifier((short) viaVersionTag.get("id").getValue());
|
||||
item.setData((Short) viaVersionTag.get("data").getValue());
|
||||
|
||||
if (viaVersionTag.contains("noDisplay")) tag.remove("display");
|
||||
|
||||
if (viaVersionTag.contains("Unbreakable")) {
|
||||
tag.put("Unbreakable", viaVersionTag.get("Unbreakable").copy());
|
||||
}
|
||||
|
||||
if (viaVersionTag.contains("displayName")) {
|
||||
CompoundTag display = tag.get("display");
|
||||
if (display == null) tag.put("display", display = new CompoundTag());
|
||||
StringTag name = display.get("Name");
|
||||
if (name == null) display.put("Name", new StringTag((String) viaVersionTag.get("displayName").getValue()));
|
||||
else name.setValue((String) viaVersionTag.get("displayName").getValue());
|
||||
} else if (tag.contains("display")) {
|
||||
((CompoundTag) tag.get("display")).remove("Name");
|
||||
}
|
||||
|
||||
if (viaVersionTag.contains("lore")) {
|
||||
CompoundTag display = tag.get("display");
|
||||
if (display == null) tag.put("display", display = new CompoundTag());
|
||||
ListTag lore = display.get("Lore");
|
||||
if (lore == null) display.put("Lore", new ListTag((List<Tag>) viaVersionTag.get("lore").getValue()));
|
||||
else lore.setValue((List<Tag>) viaVersionTag.get("lore").getValue());
|
||||
} else if (tag.contains("display")) {
|
||||
((CompoundTag) tag.get("display")).remove("Lore");
|
||||
}
|
||||
|
||||
tag.remove("AttributeModifiers");
|
||||
if (viaVersionTag.contains("AttributeModifiers")) {
|
||||
tag.put("AttributeModifiers", viaVersionTag.get("AttributeModifiers"));
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
}
|
||||
-885
@@ -1,885 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.sound;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public class SoundRemapper {
|
||||
private final static HashMap<Integer, String> sounds1_9 = new HashMap<>();
|
||||
private final static HashMap<String, String> sound1_9to1_8 = new HashMap<>();
|
||||
private static int id;
|
||||
|
||||
private static void register1_9Sound(String sound1_9) {
|
||||
sounds1_9.put(id++, sound1_9);
|
||||
}
|
||||
|
||||
private static void registerSoundRemapping(String sound1_9, String sound1_8) {
|
||||
sound1_9to1_8.put(sound1_9, sound1_8);
|
||||
}
|
||||
|
||||
public static String oldNameFromId(int id) {
|
||||
String sound1_9 = sounds1_9.get(id);
|
||||
if (sound1_9 == null) return null;
|
||||
return getOldName(sound1_9);
|
||||
}
|
||||
|
||||
public static String getOldName(String sound1_9) {
|
||||
return sound1_9to1_8.getOrDefault(sound1_9, sound1_9);
|
||||
}
|
||||
|
||||
static {
|
||||
registerSoundRemapping("entity.zombie_horse.ambient", "mob.horse.zombie.idle");
|
||||
registerSoundRemapping("block.note.snare", "note.snare");
|
||||
registerSoundRemapping("block.wood_button.click_off", "random.wood_click");
|
||||
registerSoundRemapping("block.wood_button.click_on", "random.wood_click");
|
||||
registerSoundRemapping("block.gravel.break", "dig.gravel");
|
||||
registerSoundRemapping("block.gravel.place", "dig.gravel");
|
||||
registerSoundRemapping("entity.arrow.hit", "random.bowhit");
|
||||
registerSoundRemapping("block.tripwire.detach", "random.bowhit");
|
||||
registerSoundRemapping("entity.splash_potion.break", "dig.glass");
|
||||
registerSoundRemapping("block.glass.break", "dig.glass");
|
||||
registerSoundRemapping("entity.zombie.ambient", "mob.zombie.say");
|
||||
registerSoundRemapping("entity.zombie_villager.ambient", "mob.zombie.say");
|
||||
registerSoundRemapping("entity.pig.death", "mob.pig.death");
|
||||
registerSoundRemapping("entity.mule.hurt", "mob.horse.donkey.hit");
|
||||
registerSoundRemapping("entity.donkey.hurt", "mob.horse.donkey.hit");
|
||||
registerSoundRemapping("entity.endermen.ambient", "mob.endermen.idle");
|
||||
registerSoundRemapping("block.portal.ambient", "portal.portal");
|
||||
registerSoundRemapping("entity.generic.burn", "random.fizz");
|
||||
registerSoundRemapping("block.fire.extinguish", "random.fizz");
|
||||
registerSoundRemapping("block.redstone_torch.burnout", "random.fizz");
|
||||
registerSoundRemapping("block.lava.extinguish", "random.fizz");
|
||||
registerSoundRemapping("entity.generic.extinguish_fire", "random.fizz");
|
||||
registerSoundRemapping("block.note.harp", "note.harp");
|
||||
registerSoundRemapping("block.snow.hit", "step.snow");
|
||||
registerSoundRemapping("block.snow.fall", "step.snow");
|
||||
registerSoundRemapping("block.snow.step", "step.snow");
|
||||
registerSoundRemapping("entity.arrow.hit_player", "random.successful_hit");
|
||||
registerSoundRemapping("entity.zombie_pig.hurt", "mob.zombiepig.zpighurt");
|
||||
registerSoundRemapping("entity.wolf.howl", "mob.wolf.howl");
|
||||
registerSoundRemapping("entity.firework.launch", "fireworks.launch");
|
||||
registerSoundRemapping("entity.cow.hurt", "mob.cow.hurt");
|
||||
registerSoundRemapping("entity.cow.death", "mob.cow.hurt");
|
||||
registerSoundRemapping("entity.firework.large_blast", "fireworks.largeBlast");
|
||||
registerSoundRemapping("entity.blaze.hurt", "mob.blaze.hit");
|
||||
registerSoundRemapping("entity.villager.death", "mob.villager.death");
|
||||
registerSoundRemapping("entity.blaze.death", "mob.blaze.death");
|
||||
registerSoundRemapping("entity.zombie_horse.death", "mob.horse.zombie.death");
|
||||
registerSoundRemapping("entity.silverfish.death", "mob.silverfish.kill");
|
||||
registerSoundRemapping("entity.endermite.death", "mob.silverfish.kill");
|
||||
registerSoundRemapping("record.ward", "records.ward");
|
||||
registerSoundRemapping("entity.wolf.pant", "mob.wolf.panting");
|
||||
registerSoundRemapping("block.metal.break", "dig.stone");
|
||||
registerSoundRemapping("block.metal.place", "dig.stone");
|
||||
registerSoundRemapping("entity.armorstand.place", "dig.stone");
|
||||
registerSoundRemapping("block.stone.break", "dig.stone");
|
||||
registerSoundRemapping("block.stone.place", "dig.stone");
|
||||
registerSoundRemapping("block.anvil.break", "dig.stone");
|
||||
registerSoundRemapping("block.glass.place", "dig.stone");
|
||||
registerSoundRemapping("entity.endermen.stare", "mob.endermen.stare");
|
||||
registerSoundRemapping("entity.small_magmacube.hurt", "mob.slime.small");
|
||||
registerSoundRemapping("block.slime.fall", "mob.slime.small");
|
||||
registerSoundRemapping("entity.small_slime.death", "mob.slime.small");
|
||||
registerSoundRemapping("block.slime.step", "mob.slime.small");
|
||||
registerSoundRemapping("entity.small_magmacube.death", "mob.slime.small");
|
||||
registerSoundRemapping("entity.small_slime.hurt", "mob.slime.small");
|
||||
registerSoundRemapping("block.slime.hit", "mob.slime.small");
|
||||
registerSoundRemapping("music.nether", "music.game.nether");
|
||||
registerSoundRemapping("entity.ghast.death", "mob.ghast.death");
|
||||
registerSoundRemapping("entity.guardian.attack", "mob.guardian.attack");
|
||||
registerSoundRemapping("block.dispenser.fail", "random.click");
|
||||
registerSoundRemapping("block.comparator.click", "random.click");
|
||||
registerSoundRemapping("block.stone_button.click_on", "random.click");
|
||||
registerSoundRemapping("block.stone_button.click_off", "random.click");
|
||||
registerSoundRemapping("block.tripwire.click_on", "random.click");
|
||||
registerSoundRemapping("block.dispenser.dispense", "random.click");
|
||||
registerSoundRemapping("ui.button.click", "random.click");
|
||||
registerSoundRemapping("block.lever.click", "random.click");
|
||||
registerSoundRemapping("block.tripwire.attach", "random.click");
|
||||
registerSoundRemapping("block.stone_pressureplate.click_on", "random.click");
|
||||
registerSoundRemapping("block.wood_pressureplate.click_off", "random.click");
|
||||
registerSoundRemapping("block.stone_pressureplate.click_off", "random.click");
|
||||
registerSoundRemapping("block.metal_pressureplate.click_off", "random.click");
|
||||
registerSoundRemapping("block.tripwire.click_off", "random.click");
|
||||
registerSoundRemapping("block.metal_pressureplate.click_on", "random.click");
|
||||
registerSoundRemapping("block.wood_pressureplate.click_on", "random.click");
|
||||
registerSoundRemapping("entity.zombie_pig.ambient", "mob.zombiepig.zpig");
|
||||
registerSoundRemapping("music.dragon", "music.game.end.dragon");
|
||||
registerSoundRemapping("entity.firework.twinkle_far", "fireworks.twinkle_far");
|
||||
registerSoundRemapping("entity.elder_guardian.ambient_land", "mob.guardian.land.idle");
|
||||
registerSoundRemapping("entity.guardian.ambient_land", "mob.guardian.land.idle");
|
||||
registerSoundRemapping("block.grass.break", "dig.grass");
|
||||
registerSoundRemapping("block.grass.place", "dig.grass");
|
||||
registerSoundRemapping("entity.skeleton.step", "mob.skeleton.step");
|
||||
registerSoundRemapping("entity.wither.death", "mob.wither.death");
|
||||
registerSoundRemapping("entity.wolf.hurt", "mob.wolf.hurt");
|
||||
registerSoundRemapping("entity.pig.saddle", "mob.horse.leather");
|
||||
registerSoundRemapping("entity.horse.saddle", "mob.horse.leather");
|
||||
registerSoundRemapping("entity.bat.loop", "mob.bat.loop");
|
||||
registerSoundRemapping("entity.ghast.hurt", "mob.ghast.scream");
|
||||
registerSoundRemapping("entity.creeper.death", "mob.creeper.death");
|
||||
registerSoundRemapping("entity.horse.gallop", "mob.horse.gallop");
|
||||
registerSoundRemapping("entity.wither.spawn", "mob.wither.spawn");
|
||||
registerSoundRemapping("entity.endermen.hurt", "mob.endermen.hit");
|
||||
registerSoundRemapping("entity.creeper.hurt", "mob.creeper.say");
|
||||
registerSoundRemapping("entity.horse.step_wood", "mob.horse.wood");
|
||||
registerSoundRemapping("entity.rabbit.death", "mob.rabbit.death");
|
||||
registerSoundRemapping("entity.zombie_villager.converted", "mob.zombie.unfect");
|
||||
registerSoundRemapping("block.anvil.use", "random.anvil_use");
|
||||
registerSoundRemapping("block.enderchest.close", "random.chestclosed");
|
||||
registerSoundRemapping("entity.mooshroom.shear", "mob.sheep.shear");
|
||||
registerSoundRemapping("entity.sheep.shear", "mob.sheep.shear");
|
||||
registerSoundRemapping("entity.item.pickup", "random.pop");
|
||||
registerSoundRemapping("entity.bat.death", "mob.bat.death");
|
||||
registerSoundRemapping("block.wood.place", "dig.wood");
|
||||
registerSoundRemapping("block.wood.break", "dig.wood");
|
||||
registerSoundRemapping("block.ladder.place", "dig.wood");
|
||||
registerSoundRemapping("entity.armorstand.fall", "dig.wood");
|
||||
registerSoundRemapping("block.ladder.break", "dig.wood");
|
||||
registerSoundRemapping("record.chirp", "records.chirp");
|
||||
registerSoundRemapping("entity.mule.death", "mob.horse.donkey.death");
|
||||
registerSoundRemapping("entity.donkey.death", "mob.horse.donkey.death");
|
||||
registerSoundRemapping("entity.firework.blast", "fireworks.blast");
|
||||
registerSoundRemapping("entity.zombie_pig.angry", "mob.zombiepig.zpigangry");
|
||||
registerSoundRemapping("entity.guardian.flop", "mob.guardian.flop");
|
||||
registerSoundRemapping("entity.villager.yes", "mob.villager.yes");
|
||||
registerSoundRemapping("entity.ghast.warn", "mob.ghast.charge");
|
||||
registerSoundRemapping("entity.tnt.primed", "creeper.primed");
|
||||
registerSoundRemapping("entity.creeper.primed", "creeper.primed");
|
||||
registerSoundRemapping("block.sand.place", "dig.sand");
|
||||
registerSoundRemapping("block.sand.break", "dig.sand");
|
||||
registerSoundRemapping("entity.chicken.ambient", "mob.chicken.say");
|
||||
registerSoundRemapping("record.13", "records.13");
|
||||
registerSoundRemapping("record.11", "records.11");
|
||||
registerSoundRemapping("entity.elder_guardian.death", "mob.guardian.elder.death");
|
||||
registerSoundRemapping("entity.firework.twinkle", "fireworks.twinkle");
|
||||
registerSoundRemapping("entity.skeleton_horse.death", "mob.horse.skeleton.death");
|
||||
registerSoundRemapping("weather.rain", "ambient.weather.rain");
|
||||
registerSoundRemapping("weather.rain.above", "ambient.weather.rain");
|
||||
registerSoundRemapping("block.portal.trigger", "portal.trigger");
|
||||
registerSoundRemapping("block.enderchest.open", "random.chestopen");
|
||||
registerSoundRemapping("entity.horse.land", "mob.horse.land");
|
||||
registerSoundRemapping("entity.endermite.step", "mob.silverfish.step");
|
||||
registerSoundRemapping("entity.silverfish.step", "mob.silverfish.step");
|
||||
registerSoundRemapping("entity.bat.takeoff", "mob.bat.takeoff");
|
||||
registerSoundRemapping("entity.villager.no", "mob.villager.no");
|
||||
registerSoundRemapping("entity.irongolem.step", "mob.irongolem.walk");
|
||||
registerSoundRemapping("block.note.hat", "note.hat");
|
||||
registerSoundRemapping("entity.zombie.attack_iron_door", "mob.zombie.metal");
|
||||
registerSoundRemapping("entity.villager.trading", "mob.villager.haggle");
|
||||
registerSoundRemapping("item.firecharge.use", "mob.ghast.fireball");
|
||||
registerSoundRemapping("entity.ghast.shoot", "mob.ghast.fireball");
|
||||
registerSoundRemapping("entity.enderdragon.shoot", "mob.ghast.fireball");
|
||||
registerSoundRemapping("entity.blaze.shoot", "mob.ghast.fireball");
|
||||
registerSoundRemapping("music.credits", "music.game.end.credits");
|
||||
registerSoundRemapping("entity.irongolem.death", "mob.irongolem.death");
|
||||
registerSoundRemapping("entity.item.break", "random.break");
|
||||
registerSoundRemapping("item.shield.break", "random.break");
|
||||
registerSoundRemapping("record.mellohi", "records.mellohi");
|
||||
registerSoundRemapping("entity.zombie_villager.cure", "mob.zombie.remedy");
|
||||
registerSoundRemapping("entity.enderpearl.throw", "random.bow");
|
||||
registerSoundRemapping("block.dispenser.launch", "random.bow");
|
||||
registerSoundRemapping("entity.skeleton.shoot", "random.bow");
|
||||
registerSoundRemapping("entity.endereye.launch", "random.bow");
|
||||
registerSoundRemapping("entity.firework.shoot", "random.bow");
|
||||
registerSoundRemapping("entity.experience_bottle.throw", "random.bow");
|
||||
registerSoundRemapping("entity.snowman.shoot", "random.bow");
|
||||
registerSoundRemapping("entity.arrow.shoot", "random.bow");
|
||||
registerSoundRemapping("entity.egg.throw", "random.bow");
|
||||
registerSoundRemapping("entity.snowball.throw", "random.bow");
|
||||
registerSoundRemapping("entity.bobber.throw", "random.bow");
|
||||
registerSoundRemapping("entity.lingeringpotion.throw", "random.bow");
|
||||
registerSoundRemapping("entity.splash_potion.throw", "random.bow");
|
||||
registerSoundRemapping("entity.villager.ambient", "mob.villager.idle");
|
||||
registerSoundRemapping("block.cloth.hit", "step.cloth");
|
||||
registerSoundRemapping("block.cloth.step", "step.cloth");
|
||||
registerSoundRemapping("block.cloth.fall", "step.cloth");
|
||||
registerSoundRemapping("entity.silverfish.hurt", "mob.silverfish.hit");
|
||||
registerSoundRemapping("entity.endermite.hurt", "mob.silverfish.hit");
|
||||
registerSoundRemapping("music.game", "music.game");
|
||||
registerSoundRemapping("block.lava.ambient", "liquid.lava");
|
||||
registerSoundRemapping("record.mall", "records.mall");
|
||||
registerSoundRemapping("entity.blaze.burn", "fire.fire");
|
||||
registerSoundRemapping("block.fire.ambient", "fire.fire");
|
||||
registerSoundRemapping("entity.zombie.attack_door_wood", "mob.zombie.wood");
|
||||
registerSoundRemapping("entity.chicken.step", "mob.chicken.step");
|
||||
registerSoundRemapping("record.stal", "records.stal");
|
||||
registerSoundRemapping("entity.elder_guardian.hurt_land", "mob.guardian.land.hit");
|
||||
registerSoundRemapping("entity.guardian.hurt_land", "mob.guardian.land.hit");
|
||||
registerSoundRemapping("entity.chicken.egg", "mob.chicken.plop");
|
||||
registerSoundRemapping("entity.donkey.chest", "mob.chicken.plop");
|
||||
registerSoundRemapping("entity.enderdragon.flap", "mob.enderdragon.wings");
|
||||
registerSoundRemapping("block.grass.step", "step.grass");
|
||||
registerSoundRemapping("block.grass.fall", "step.grass");
|
||||
registerSoundRemapping("block.grass.hit", "step.grass");
|
||||
registerSoundRemapping("entity.horse.breathe", "mob.horse.breathe");
|
||||
registerSoundRemapping("entity.mule.ambient", "mob.horse.donkey.idle");
|
||||
registerSoundRemapping("entity.donkey.ambient", "mob.horse.donkey.idle");
|
||||
registerSoundRemapping("record.far", "records.far");
|
||||
registerSoundRemapping("entity.spider.step", "mob.spider.step");
|
||||
registerSoundRemapping("entity.cow.ambient", "mob.cow.say");
|
||||
registerSoundRemapping("entity.horse.jump", "mob.horse.jump");
|
||||
registerSoundRemapping("entity.horse.step", "mob.horse.soft");
|
||||
registerSoundRemapping("entity.guardian.hurt", "mob.guardian.hit");
|
||||
registerSoundRemapping("entity.enderdragon.death", "mob.enderdragon.end");
|
||||
registerSoundRemapping("entity.zombie_villager.step", "mob.zombie.step");
|
||||
registerSoundRemapping("entity.zombie.step", "mob.zombie.step");
|
||||
registerSoundRemapping("entity.enderdragon.ambient", "mob.enderdragon.growl");
|
||||
registerSoundRemapping("entity.enderdragon.growl", "mob.enderdragon.growl");
|
||||
registerSoundRemapping("entity.wolf.shake", "mob.wolf.shake");
|
||||
registerSoundRemapping("entity.endermen.death", "mob.endermen.death");
|
||||
registerSoundRemapping("block.anvil.place", "random.anvil_land");
|
||||
registerSoundRemapping("block.anvil.land", "random.anvil_land");
|
||||
registerSoundRemapping("entity.minecart.inside", "minecart.inside");
|
||||
registerSoundRemapping("entity.slime.squish", "mob.slime.big");
|
||||
registerSoundRemapping("entity.magmacube.hurt", "mob.slime.big");
|
||||
registerSoundRemapping("entity.magmacube.death", "mob.slime.big");
|
||||
registerSoundRemapping("block.slime.break", "mob.slime.big");
|
||||
registerSoundRemapping("block.slime.place", "mob.slime.big");
|
||||
registerSoundRemapping("entity.slime.jump", "mob.slime.big");
|
||||
registerSoundRemapping("entity.slime.hurt", "mob.slime.big");
|
||||
registerSoundRemapping("entity.slime.death", "mob.slime.big");
|
||||
registerSoundRemapping("block.water.ambient", "liquid.water");
|
||||
registerSoundRemapping("entity.pig.hurt", "mob.pig.say");
|
||||
registerSoundRemapping("entity.pig.ambient", "mob.pig.say");
|
||||
registerSoundRemapping("entity.wither.shoot", "mob.wither.shoot");
|
||||
registerSoundRemapping("record.blocks", "records.blocks");
|
||||
registerSoundRemapping("item.firecharge.use", "item.fireCharge.use");
|
||||
registerSoundRemapping("entity.ghast.shoot", "item.fireCharge.use");
|
||||
registerSoundRemapping("entity.enderdragon.shoot", "item.fireCharge.use");
|
||||
registerSoundRemapping("entity.blaze.shoot", "item.fireCharge.use");
|
||||
registerSoundRemapping("block.sand.hit", "step.sand");
|
||||
registerSoundRemapping("block.sand.step", "step.sand");
|
||||
registerSoundRemapping("block.sand.fall", "step.sand");
|
||||
registerSoundRemapping("music.creative", "music.game.creative");
|
||||
registerSoundRemapping("entity.irongolem.hurt", "mob.irongolem.hit");
|
||||
registerSoundRemapping("entity.horse.death", "mob.horse.death");
|
||||
registerSoundRemapping("entity.bat.hurt", "mob.bat.hurt");
|
||||
registerSoundRemapping("entity.ghast.scream", "mob.ghast.affectionate_scream");
|
||||
registerSoundRemapping("entity.elder_guardian.ambient", "mob.guardian.elder.idle");
|
||||
registerSoundRemapping("entity.zombie_pig.death", "mob.zombiepig.zpigdeath");
|
||||
registerSoundRemapping("entity.lightning.thunder", "ambient.weather.thunder");
|
||||
registerSoundRemapping("entity.minecart.riding", "minecart.base");
|
||||
registerSoundRemapping("block.ladder.step", "step.ladder");
|
||||
registerSoundRemapping("block.ladder.fall", "step.ladder");
|
||||
registerSoundRemapping("block.ladder.hit", "step.ladder");
|
||||
registerSoundRemapping("entity.donkey.angry", "mob.horse.donkey.angry");
|
||||
registerSoundRemapping("ambient.cave", "ambient.cave.cave");
|
||||
registerSoundRemapping("record.wait", "records.wait");
|
||||
registerSoundRemapping("entity.firework.blast_far", "fireworks.blast_far");
|
||||
registerSoundRemapping("entity.generic.drink", "random.drink");
|
||||
registerSoundRemapping("music.menu", "music.menu");
|
||||
registerSoundRemapping("entity.cat.hiss", "mob.cat.hiss");
|
||||
registerSoundRemapping("block.note.basedrum", "note.bd");
|
||||
registerSoundRemapping("entity.spider.ambient", "mob.spider.say");
|
||||
registerSoundRemapping("entity.spider.hurt", "mob.spider.say");
|
||||
registerSoundRemapping("block.stone.fall", "step.stone");
|
||||
registerSoundRemapping("block.anvil.fall", "step.stone");
|
||||
registerSoundRemapping("block.metal.step", "step.stone");
|
||||
registerSoundRemapping("block.stone.hit", "step.stone");
|
||||
registerSoundRemapping("block.glass.fall", "step.stone");
|
||||
registerSoundRemapping("block.stone.step", "step.stone");
|
||||
registerSoundRemapping("block.anvil.step", "step.stone");
|
||||
registerSoundRemapping("block.metal.hit", "step.stone");
|
||||
registerSoundRemapping("block.glass.step", "step.stone");
|
||||
registerSoundRemapping("block.metal.fall", "step.stone");
|
||||
registerSoundRemapping("block.glass.hit", "step.stone");
|
||||
registerSoundRemapping("block.anvil.hit", "step.stone");
|
||||
registerSoundRemapping("entity.player.levelup", "random.levelup");
|
||||
registerSoundRemapping("block.lava.pop", "liquid.lavapop");
|
||||
registerSoundRemapping("entity.sheep.hurt", "mob.sheep.say");
|
||||
registerSoundRemapping("entity.sheep.death", "mob.sheep.say");
|
||||
registerSoundRemapping("entity.sheep.ambient", "mob.sheep.say");
|
||||
registerSoundRemapping("entity.skeleton.ambient", "mob.skeleton.say");
|
||||
registerSoundRemapping("entity.blaze.ambient", "mob.blaze.breathe");
|
||||
registerSoundRemapping("entity.bat.ambient", "mob.bat.idle");
|
||||
registerSoundRemapping("entity.magmacube.squish", "mob.magmacube.big");
|
||||
registerSoundRemapping("entity.horse.ambient", "mob.horse.idle");
|
||||
registerSoundRemapping("entity.zombie_horse.hurt", "mob.horse.zombie.hit");
|
||||
registerSoundRemapping("entity.irongolem.attack", "mob.irongolem.throw");
|
||||
registerSoundRemapping("block.cloth.break", "dig.cloth");
|
||||
registerSoundRemapping("block.cloth.place", "dig.cloth");
|
||||
registerSoundRemapping("block.gravel.fall", "step.gravel");
|
||||
registerSoundRemapping("block.gravel.step", "step.gravel");
|
||||
registerSoundRemapping("block.gravel.hit", "step.gravel");
|
||||
registerSoundRemapping("entity.endermite.ambient", "mob.silverfish.say");
|
||||
registerSoundRemapping("entity.silverfish.ambient", "mob.silverfish.say");
|
||||
registerSoundRemapping("entity.cat.purr", "mob.cat.purr");
|
||||
registerSoundRemapping("entity.zombie.infect", "mob.zombie.infect");
|
||||
registerSoundRemapping("entity.generic.eat", "random.eat");
|
||||
registerSoundRemapping("entity.wolf.ambient", "mob.wolf.bark");
|
||||
registerSoundRemapping("entity.tnt.primed", "game.tnt.primed");
|
||||
registerSoundRemapping("entity.creeper.primed", "game.tnt.primed");
|
||||
registerSoundRemapping("entity.sheep.step", "mob.sheep.step");
|
||||
registerSoundRemapping("entity.zombie_villager.death", "mob.zombie.death");
|
||||
registerSoundRemapping("entity.zombie.death", "mob.zombie.death");
|
||||
registerSoundRemapping("entity.shulker.teleport", "mob.endermen.portal");
|
||||
registerSoundRemapping("item.chorus_fruit.teleport", "mob.endermen.portal");
|
||||
registerSoundRemapping("entity.endermen.teleport", "mob.endermen.portal");
|
||||
registerSoundRemapping("entity.horse.angry", "mob.horse.angry");
|
||||
registerSoundRemapping("entity.wolf.growl", "mob.wolf.growl");
|
||||
registerSoundRemapping("block.snow.break", "dig.snow");
|
||||
registerSoundRemapping("block.snow.place", "dig.snow");
|
||||
registerSoundRemapping("block.piston.extend", "tile.piston.out");
|
||||
registerSoundRemapping("entity.player.burp", "random.burp");
|
||||
registerSoundRemapping("entity.cow.step", "mob.cow.step");
|
||||
registerSoundRemapping("entity.wither.hurt", "mob.wither.hurt");
|
||||
registerSoundRemapping("entity.guardian.death_land", "mob.guardian.land.death");
|
||||
registerSoundRemapping("entity.elder_guardian.death_land", "mob.guardian.land.death");
|
||||
registerSoundRemapping("music.end", "music.game.end");
|
||||
registerSoundRemapping("entity.chicken.hurt", "mob.chicken.hurt");
|
||||
registerSoundRemapping("entity.chicken.death", "mob.chicken.hurt");
|
||||
registerSoundRemapping("entity.wolf.step", "mob.wolf.step");
|
||||
registerSoundRemapping("entity.wolf.death", "mob.wolf.death");
|
||||
registerSoundRemapping("entity.wolf.whine", "mob.wolf.whine");
|
||||
registerSoundRemapping("block.note.pling", "note.pling");
|
||||
registerSoundRemapping("entity.rabbit.hurt", "mob.rabbit.hurt");
|
||||
registerSoundRemapping("entity.cat.purreow", "mob.cat.purreow");
|
||||
registerSoundRemapping("entity.firework.large_blast_far", "fireworks.largeBlast_far");
|
||||
registerSoundRemapping("entity.skeleton.hurt", "mob.skeleton.hurt");
|
||||
registerSoundRemapping("entity.spider.death", "mob.spider.death");
|
||||
registerSoundRemapping("block.anvil.destroy", "random.anvil_break");
|
||||
registerSoundRemapping("record.cat", "records.cat");
|
||||
registerSoundRemapping("entity.wither.ambient", "mob.wither.idle");
|
||||
registerSoundRemapping("entity.elder_guardian.hurt", "mob.guardian.elder.hit");
|
||||
registerSoundRemapping("entity.endermen.scream", "mob.endermen.scream");
|
||||
registerSoundRemapping("entity.cat.death", "mob.cat.hitt");
|
||||
registerSoundRemapping("entity.cat.hurt", "mob.cat.hitt");
|
||||
registerSoundRemapping("entity.small_magmacube.squish", "mob.magmacube.small");
|
||||
registerSoundRemapping("item.flintandsteel.use", "fire.ignite");
|
||||
registerSoundRemapping("entity.enderdragon.hurt", "mob.enderdragon.hit");
|
||||
registerSoundRemapping("entity.zombie.hurt", "mob.zombie.hurt");
|
||||
registerSoundRemapping("entity.zombie_villager.hurt", "mob.zombie.hurt");
|
||||
registerSoundRemapping("entity.enderdragon_fireball.explode", "random.explode");
|
||||
registerSoundRemapping("entity.generic.explode", "random.explode");
|
||||
registerSoundRemapping("entity.lightning.impact", "random.explode");
|
||||
registerSoundRemapping("block.end_gateway.spawn", "random.explode");
|
||||
registerSoundRemapping("entity.slime.attack", "mob.slime.attack");
|
||||
registerSoundRemapping("entity.magmacube.jump", "mob.magmacube.jump");
|
||||
registerSoundRemapping("entity.bobber.splash", "random.splash");
|
||||
registerSoundRemapping("entity.skeleton_horse.hurt", "mob.horse.skeleton.hit");
|
||||
registerSoundRemapping("entity.rabbit.jump", "mob.rabbit.hop");
|
||||
registerSoundRemapping("entity.ghast.ambient", "mob.ghast.moan");
|
||||
registerSoundRemapping("entity.elder_guardian.curse", "mob.guardian.curse");
|
||||
registerSoundRemapping("entity.splash_potion.break", "game.potion.smash");
|
||||
registerSoundRemapping("block.glass.break", "game.potion.smash");
|
||||
registerSoundRemapping("block.note.bass", "note.bassattack");
|
||||
registerSoundRemapping("block.dispenser.fail", "gui.button.press");
|
||||
registerSoundRemapping("block.comparator.click", "gui.button.press");
|
||||
registerSoundRemapping("block.stone_button.click_on", "gui.button.press");
|
||||
registerSoundRemapping("block.stone_button.click_off", "gui.button.press");
|
||||
registerSoundRemapping("block.tripwire.click_on", "gui.button.press");
|
||||
registerSoundRemapping("block.dispenser.dispense", "gui.button.press");
|
||||
registerSoundRemapping("ui.button.click", "gui.button.press");
|
||||
registerSoundRemapping("block.lever.click", "gui.button.press");
|
||||
registerSoundRemapping("block.tripwire.attach", "gui.button.press");
|
||||
registerSoundRemapping("block.stone_pressureplate.click_on", "gui.button.press");
|
||||
registerSoundRemapping("block.wood_pressureplate.click_off", "gui.button.press");
|
||||
registerSoundRemapping("block.stone_pressureplate.click_off", "gui.button.press");
|
||||
registerSoundRemapping("block.metal_pressureplate.click_off", "gui.button.press");
|
||||
registerSoundRemapping("block.tripwire.click_off", "gui.button.press");
|
||||
registerSoundRemapping("block.metal_pressureplate.click_on", "gui.button.press");
|
||||
registerSoundRemapping("block.wood_pressureplate.click_on", "gui.button.press");
|
||||
registerSoundRemapping("entity.experience_orb.touch", "random.orb");
|
||||
registerSoundRemapping("entity.experience_orb.pickup", "random.orb");
|
||||
registerSoundRemapping("entity.wither.break_block", "mob.zombie.woodbreak");
|
||||
registerSoundRemapping("entity.zombie.break_door_wood", "mob.zombie.woodbreak");
|
||||
registerSoundRemapping("entity.horse.armor", "mob.horse.armor");
|
||||
registerSoundRemapping("entity.rabbit.ambient", "mob.rabbit.idle");
|
||||
registerSoundRemapping("block.piston.contract", "tile.piston.in");
|
||||
registerSoundRemapping("entity.cat.ambient", "mob.cat.meow");
|
||||
registerSoundRemapping("entity.pig.step", "mob.pig.step");
|
||||
registerSoundRemapping("record.strad", "records.strad");
|
||||
registerSoundRemapping("block.wood.hit", "step.wood");
|
||||
registerSoundRemapping("block.wood.fall", "step.wood");
|
||||
registerSoundRemapping("block.wood.step", "step.wood");
|
||||
registerSoundRemapping("block.portal.travel", "portal.travel");
|
||||
registerSoundRemapping("entity.guardian.death", "mob.guardian.death");
|
||||
registerSoundRemapping("entity.skeleton.death", "mob.skeleton.death");
|
||||
registerSoundRemapping("entity.horse.hurt", "mob.horse.hit");
|
||||
registerSoundRemapping("entity.villager.hurt", "mob.villager.hit");
|
||||
registerSoundRemapping("entity.skeleton_horse.ambient", "mob.horse.skeleton.idle");
|
||||
registerSoundRemapping("block.chest.open", "random.chestopen");
|
||||
registerSoundRemapping("block.chest.close", "random.chestclosed");
|
||||
registerSoundRemapping("entity.player.hurt_on_fire", "game.player.hurt");
|
||||
registerSoundRemapping("entity.player.hurt_drown", "game.player.hurt");
|
||||
registerSoundRemapping("entity.generic.swim", "game.neutral.swim");
|
||||
registerSoundRemapping("entity.hostile.swim", "game.hostile.swim");
|
||||
registerSoundRemapping("entity.player.swim", "game.player.swim");
|
||||
registerSoundRemapping("entity.player.splash", "game.player.swim.splash");
|
||||
registerSoundRemapping("entity.hostile.splash", "game.hostile.swim.splash");
|
||||
registerSoundRemapping("entity.generic.splash", "game.neutral.swim.splash");
|
||||
registerSoundRemapping("entity.generic.death", "game.neutral.die");
|
||||
registerSoundRemapping("entity.hostile.hurt", "game.hostile.hurt");
|
||||
registerSoundRemapping("entity.player.hurt", "game.player.hurt");
|
||||
registerSoundRemapping("entity.hostile.death", "game.hostile.die");
|
||||
registerSoundRemapping("entity.generic.hurt", "game.neutral.hurt");
|
||||
registerSoundRemapping("entity.player.death", "game.player.die");
|
||||
registerSoundRemapping("entity.player.big_fall", "game.player.hurt.fall.big");
|
||||
registerSoundRemapping("entity.generic.big_fall", "game.neutral.hurt.fall.big");
|
||||
registerSoundRemapping("entity.hostile.big_fall", "game.hostile.hurt.fall.big");
|
||||
registerSoundRemapping("entity.hostile.small_fall", "game.hostile.hurt.fall.small");
|
||||
registerSoundRemapping("entity.player.small_fall", "game.player.hurt.fall.small");
|
||||
registerSoundRemapping("entity.generic.small_fall", "game.neutral.hurt.fall.small");
|
||||
|
||||
register1_9Sound("ambient.cave");
|
||||
register1_9Sound("block.anvil.break");
|
||||
register1_9Sound("block.anvil.destroy");
|
||||
register1_9Sound("block.anvil.fall");
|
||||
register1_9Sound("block.anvil.hit");
|
||||
register1_9Sound("block.anvil.land");
|
||||
register1_9Sound("block.anvil.place");
|
||||
register1_9Sound("block.anvil.step");
|
||||
register1_9Sound("block.anvil.use");
|
||||
register1_9Sound("block.brewing_stand.brew");
|
||||
register1_9Sound("block.chest.close");
|
||||
register1_9Sound("block.chest.locked");
|
||||
register1_9Sound("block.chest.open");
|
||||
register1_9Sound("block.chorus_flower.death");
|
||||
register1_9Sound("block.chorus_flower.grow");
|
||||
register1_9Sound("block.cloth.break");
|
||||
register1_9Sound("block.cloth.fall");
|
||||
register1_9Sound("block.cloth.hit");
|
||||
register1_9Sound("block.cloth.place");
|
||||
register1_9Sound("block.cloth.step");
|
||||
register1_9Sound("block.comparator.click");
|
||||
register1_9Sound("block.dispenser.dispense");
|
||||
register1_9Sound("block.dispenser.fail");
|
||||
register1_9Sound("block.dispenser.launch");
|
||||
register1_9Sound("block.end_gateway.spawn");
|
||||
register1_9Sound("block.enderchest.close");
|
||||
register1_9Sound("block.enderchest.open");
|
||||
register1_9Sound("block.fence_gate.close");
|
||||
register1_9Sound("block.fence_gate.open");
|
||||
register1_9Sound("block.fire.ambient");
|
||||
register1_9Sound("block.fire.extinguish");
|
||||
register1_9Sound("block.furnace.fire_crackle");
|
||||
register1_9Sound("block.glass.break");
|
||||
register1_9Sound("block.glass.fall");
|
||||
register1_9Sound("block.glass.hit");
|
||||
register1_9Sound("block.glass.place");
|
||||
register1_9Sound("block.glass.step");
|
||||
register1_9Sound("block.grass.break");
|
||||
register1_9Sound("block.grass.fall");
|
||||
register1_9Sound("block.grass.hit");
|
||||
register1_9Sound("block.grass.place");
|
||||
register1_9Sound("block.grass.step");
|
||||
register1_9Sound("block.gravel.break");
|
||||
register1_9Sound("block.gravel.fall");
|
||||
register1_9Sound("block.gravel.hit");
|
||||
register1_9Sound("block.gravel.place");
|
||||
register1_9Sound("block.gravel.step");
|
||||
register1_9Sound("block.iron_door.close");
|
||||
register1_9Sound("block.iron_door.open");
|
||||
register1_9Sound("block.iron_trapdoor.close");
|
||||
register1_9Sound("block.iron_trapdoor.open");
|
||||
register1_9Sound("block.ladder.break");
|
||||
register1_9Sound("block.ladder.fall");
|
||||
register1_9Sound("block.ladder.hit");
|
||||
register1_9Sound("block.ladder.place");
|
||||
register1_9Sound("block.ladder.step");
|
||||
register1_9Sound("block.lava.ambient");
|
||||
register1_9Sound("block.lava.extinguish");
|
||||
register1_9Sound("block.lava.pop");
|
||||
register1_9Sound("block.lever.click");
|
||||
register1_9Sound("block.metal.break");
|
||||
register1_9Sound("block.metal.fall");
|
||||
register1_9Sound("block.metal.hit");
|
||||
register1_9Sound("block.metal.place");
|
||||
register1_9Sound("block.metal.step");
|
||||
register1_9Sound("block.metal_pressureplate.click_off");
|
||||
register1_9Sound("block.metal_pressureplate.click_on");
|
||||
register1_9Sound("block.note.basedrum");
|
||||
register1_9Sound("block.note.bass");
|
||||
register1_9Sound("block.note.harp");
|
||||
register1_9Sound("block.note.hat");
|
||||
register1_9Sound("block.note.pling");
|
||||
register1_9Sound("block.note.snare");
|
||||
register1_9Sound("block.piston.contract");
|
||||
register1_9Sound("block.piston.extend");
|
||||
register1_9Sound("block.portal.ambient");
|
||||
register1_9Sound("block.portal.travel");
|
||||
register1_9Sound("block.portal.trigger");
|
||||
register1_9Sound("block.redstone_torch.burnout");
|
||||
register1_9Sound("block.sand.break");
|
||||
register1_9Sound("block.sand.fall");
|
||||
register1_9Sound("block.sand.hit");
|
||||
register1_9Sound("block.sand.place");
|
||||
register1_9Sound("block.sand.step");
|
||||
register1_9Sound("block.slime.break");
|
||||
register1_9Sound("block.slime.fall");
|
||||
register1_9Sound("block.slime.hit");
|
||||
register1_9Sound("block.slime.place");
|
||||
register1_9Sound("block.slime.step");
|
||||
register1_9Sound("block.snow.break");
|
||||
register1_9Sound("block.snow.fall");
|
||||
register1_9Sound("block.snow.hit");
|
||||
register1_9Sound("block.snow.place");
|
||||
register1_9Sound("block.snow.step");
|
||||
register1_9Sound("block.stone.break");
|
||||
register1_9Sound("block.stone.fall");
|
||||
register1_9Sound("block.stone.hit");
|
||||
register1_9Sound("block.stone.place");
|
||||
register1_9Sound("block.stone.step");
|
||||
register1_9Sound("block.stone_button.click_off");
|
||||
register1_9Sound("block.stone_button.click_on");
|
||||
register1_9Sound("block.stone_pressureplate.click_off");
|
||||
register1_9Sound("block.stone_pressureplate.click_on");
|
||||
register1_9Sound("block.tripwire.attach");
|
||||
register1_9Sound("block.tripwire.click_off");
|
||||
register1_9Sound("block.tripwire.click_on");
|
||||
register1_9Sound("block.tripwire.detach");
|
||||
register1_9Sound("block.water.ambient");
|
||||
register1_9Sound("block.waterlily.place");
|
||||
register1_9Sound("block.wood.break");
|
||||
register1_9Sound("block.wood.fall");
|
||||
register1_9Sound("block.wood.hit");
|
||||
register1_9Sound("block.wood.place");
|
||||
register1_9Sound("block.wood.step");
|
||||
register1_9Sound("block.wood_button.click_off");
|
||||
register1_9Sound("block.wood_button.click_on");
|
||||
register1_9Sound("block.wood_pressureplate.click_off");
|
||||
register1_9Sound("block.wood_pressureplate.click_on");
|
||||
register1_9Sound("block.wooden_door.close");
|
||||
register1_9Sound("block.wooden_door.open");
|
||||
register1_9Sound("block.wooden_trapdoor.close");
|
||||
register1_9Sound("block.wooden_trapdoor.open");
|
||||
register1_9Sound("enchant.thorns.hit");
|
||||
register1_9Sound("entity.armorstand.break");
|
||||
register1_9Sound("entity.armorstand.fall");
|
||||
register1_9Sound("entity.armorstand.hit");
|
||||
register1_9Sound("entity.armorstand.place");
|
||||
register1_9Sound("entity.arrow.hit");
|
||||
register1_9Sound("entity.arrow.hit_player");
|
||||
register1_9Sound("entity.arrow.shoot");
|
||||
register1_9Sound("entity.bat.ambient");
|
||||
register1_9Sound("entity.bat.death");
|
||||
register1_9Sound("entity.bat.hurt");
|
||||
register1_9Sound("entity.bat.loop");
|
||||
register1_9Sound("entity.bat.takeoff");
|
||||
register1_9Sound("entity.blaze.ambient");
|
||||
register1_9Sound("entity.blaze.burn");
|
||||
register1_9Sound("entity.blaze.death");
|
||||
register1_9Sound("entity.blaze.hurt");
|
||||
register1_9Sound("entity.blaze.shoot");
|
||||
register1_9Sound("entity.bobber.splash");
|
||||
register1_9Sound("entity.bobber.throw");
|
||||
register1_9Sound("entity.cat.ambient");
|
||||
register1_9Sound("entity.cat.death");
|
||||
register1_9Sound("entity.cat.hiss");
|
||||
register1_9Sound("entity.cat.hurt");
|
||||
register1_9Sound("entity.cat.purr");
|
||||
register1_9Sound("entity.cat.purreow");
|
||||
register1_9Sound("entity.chicken.ambient");
|
||||
register1_9Sound("entity.chicken.death");
|
||||
register1_9Sound("entity.chicken.egg");
|
||||
register1_9Sound("entity.chicken.hurt");
|
||||
register1_9Sound("entity.chicken.step");
|
||||
register1_9Sound("entity.cow.ambient");
|
||||
register1_9Sound("entity.cow.death");
|
||||
register1_9Sound("entity.cow.hurt");
|
||||
register1_9Sound("entity.cow.milk");
|
||||
register1_9Sound("entity.cow.step");
|
||||
register1_9Sound("entity.creeper.death");
|
||||
register1_9Sound("entity.creeper.hurt");
|
||||
register1_9Sound("entity.creeper.primed");
|
||||
register1_9Sound("entity.donkey.ambient");
|
||||
register1_9Sound("entity.donkey.angry");
|
||||
register1_9Sound("entity.donkey.chest");
|
||||
register1_9Sound("entity.donkey.death");
|
||||
register1_9Sound("entity.donkey.hurt");
|
||||
register1_9Sound("entity.egg.throw");
|
||||
register1_9Sound("entity.elder_guardian.ambient");
|
||||
register1_9Sound("entity.elder_guardian.ambient_land");
|
||||
register1_9Sound("entity.elder_guardian.curse");
|
||||
register1_9Sound("entity.elder_guardian.death");
|
||||
register1_9Sound("entity.elder_guardian.death_land");
|
||||
register1_9Sound("entity.elder_guardian.hurt");
|
||||
register1_9Sound("entity.elder_guardian.hurt_land");
|
||||
register1_9Sound("entity.enderdragon.ambient");
|
||||
register1_9Sound("entity.enderdragon.death");
|
||||
register1_9Sound("entity.enderdragon.flap");
|
||||
register1_9Sound("entity.enderdragon.growl");
|
||||
register1_9Sound("entity.enderdragon.hurt");
|
||||
register1_9Sound("entity.enderdragon.shoot");
|
||||
register1_9Sound("entity.enderdragon_fireball.explode");
|
||||
register1_9Sound("entity.endereye.launch");
|
||||
register1_9Sound("entity.endermen.ambient");
|
||||
register1_9Sound("entity.endermen.death");
|
||||
register1_9Sound("entity.endermen.hurt");
|
||||
register1_9Sound("entity.endermen.scream");
|
||||
register1_9Sound("entity.endermen.stare");
|
||||
register1_9Sound("entity.endermen.teleport");
|
||||
register1_9Sound("entity.endermite.ambient");
|
||||
register1_9Sound("entity.endermite.death");
|
||||
register1_9Sound("entity.endermite.hurt");
|
||||
register1_9Sound("entity.endermite.step");
|
||||
register1_9Sound("entity.enderpearl.throw");
|
||||
register1_9Sound("entity.experience_bottle.throw");
|
||||
register1_9Sound("entity.experience_orb.pickup");
|
||||
register1_9Sound("entity.experience_orb.touch");
|
||||
register1_9Sound("entity.firework.blast");
|
||||
register1_9Sound("entity.firework.blast_far");
|
||||
register1_9Sound("entity.firework.large_blast");
|
||||
register1_9Sound("entity.firework.large_blast_far");
|
||||
register1_9Sound("entity.firework.launch");
|
||||
register1_9Sound("entity.firework.shoot");
|
||||
register1_9Sound("entity.firework.twinkle");
|
||||
register1_9Sound("entity.firework.twinkle_far");
|
||||
register1_9Sound("entity.generic.big_fall");
|
||||
register1_9Sound("entity.generic.burn");
|
||||
register1_9Sound("entity.generic.death");
|
||||
register1_9Sound("entity.generic.drink");
|
||||
register1_9Sound("entity.generic.eat");
|
||||
register1_9Sound("entity.generic.explode");
|
||||
register1_9Sound("entity.generic.extinguish_fire");
|
||||
register1_9Sound("entity.generic.hurt");
|
||||
register1_9Sound("entity.generic.small_fall");
|
||||
register1_9Sound("entity.generic.splash");
|
||||
register1_9Sound("entity.generic.swim");
|
||||
register1_9Sound("entity.ghast.ambient");
|
||||
register1_9Sound("entity.ghast.death");
|
||||
register1_9Sound("entity.ghast.hurt");
|
||||
register1_9Sound("entity.ghast.scream");
|
||||
register1_9Sound("entity.ghast.shoot");
|
||||
register1_9Sound("entity.ghast.warn");
|
||||
register1_9Sound("entity.guardian.ambient");
|
||||
register1_9Sound("entity.guardian.ambient_land");
|
||||
register1_9Sound("entity.guardian.attack");
|
||||
register1_9Sound("entity.guardian.death");
|
||||
register1_9Sound("entity.guardian.death_land");
|
||||
register1_9Sound("entity.guardian.flop");
|
||||
register1_9Sound("entity.guardian.hurt");
|
||||
register1_9Sound("entity.guardian.hurt_land");
|
||||
register1_9Sound("entity.horse.ambient");
|
||||
register1_9Sound("entity.horse.angry");
|
||||
register1_9Sound("entity.horse.armor");
|
||||
register1_9Sound("entity.horse.breathe");
|
||||
register1_9Sound("entity.horse.death");
|
||||
register1_9Sound("entity.horse.eat");
|
||||
register1_9Sound("entity.horse.gallop");
|
||||
register1_9Sound("entity.horse.hurt");
|
||||
register1_9Sound("entity.horse.jump");
|
||||
register1_9Sound("entity.horse.land");
|
||||
register1_9Sound("entity.horse.saddle");
|
||||
register1_9Sound("entity.horse.step");
|
||||
register1_9Sound("entity.horse.step_wood");
|
||||
register1_9Sound("entity.hostile.big_fall");
|
||||
register1_9Sound("entity.hostile.death");
|
||||
register1_9Sound("entity.hostile.hurt");
|
||||
register1_9Sound("entity.hostile.small_fall");
|
||||
register1_9Sound("entity.hostile.splash");
|
||||
register1_9Sound("entity.hostile.swim");
|
||||
register1_9Sound("entity.irongolem.attack");
|
||||
register1_9Sound("entity.irongolem.death");
|
||||
register1_9Sound("entity.irongolem.hurt");
|
||||
register1_9Sound("entity.irongolem.step");
|
||||
register1_9Sound("entity.item.break");
|
||||
register1_9Sound("entity.item.pickup");
|
||||
register1_9Sound("entity.itemframe.add_item");
|
||||
register1_9Sound("entity.itemframe.break");
|
||||
register1_9Sound("entity.itemframe.place");
|
||||
register1_9Sound("entity.itemframe.remove_item");
|
||||
register1_9Sound("entity.itemframe.rotate_item");
|
||||
register1_9Sound("entity.leashknot.break");
|
||||
register1_9Sound("entity.leashknot.place");
|
||||
register1_9Sound("entity.lightning.impact");
|
||||
register1_9Sound("entity.lightning.thunder");
|
||||
register1_9Sound("entity.lingeringpotion.throw");
|
||||
register1_9Sound("entity.magmacube.death");
|
||||
register1_9Sound("entity.magmacube.hurt");
|
||||
register1_9Sound("entity.magmacube.jump");
|
||||
register1_9Sound("entity.magmacube.squish");
|
||||
register1_9Sound("entity.minecart.inside");
|
||||
register1_9Sound("entity.minecart.riding");
|
||||
register1_9Sound("entity.mooshroom.shear");
|
||||
register1_9Sound("entity.mule.ambient");
|
||||
register1_9Sound("entity.mule.death");
|
||||
register1_9Sound("entity.mule.hurt");
|
||||
register1_9Sound("entity.painting.break");
|
||||
register1_9Sound("entity.painting.place");
|
||||
register1_9Sound("entity.pig.ambient");
|
||||
register1_9Sound("entity.pig.death");
|
||||
register1_9Sound("entity.pig.hurt");
|
||||
register1_9Sound("entity.pig.saddle");
|
||||
register1_9Sound("entity.pig.step");
|
||||
register1_9Sound("entity.player.attack.crit");
|
||||
register1_9Sound("entity.player.attack.knockback");
|
||||
register1_9Sound("entity.player.attack.nodamage");
|
||||
register1_9Sound("entity.player.attack.strong");
|
||||
register1_9Sound("entity.player.attack.sweep");
|
||||
register1_9Sound("entity.player.attack.weak");
|
||||
register1_9Sound("entity.player.big_fall");
|
||||
register1_9Sound("entity.player.breath");
|
||||
register1_9Sound("entity.player.burp");
|
||||
register1_9Sound("entity.player.death");
|
||||
register1_9Sound("entity.player.hurt");
|
||||
register1_9Sound("entity.player.levelup");
|
||||
register1_9Sound("entity.player.small_fall");
|
||||
register1_9Sound("entity.player.splash");
|
||||
register1_9Sound("entity.player.swim");
|
||||
register1_9Sound("entity.rabbit.ambient");
|
||||
register1_9Sound("entity.rabbit.attack");
|
||||
register1_9Sound("entity.rabbit.death");
|
||||
register1_9Sound("entity.rabbit.hurt");
|
||||
register1_9Sound("entity.rabbit.jump");
|
||||
register1_9Sound("entity.sheep.ambient");
|
||||
register1_9Sound("entity.sheep.death");
|
||||
register1_9Sound("entity.sheep.hurt");
|
||||
register1_9Sound("entity.sheep.shear");
|
||||
register1_9Sound("entity.sheep.step");
|
||||
register1_9Sound("entity.shulker.ambient");
|
||||
register1_9Sound("entity.shulker.close");
|
||||
register1_9Sound("entity.shulker.death");
|
||||
register1_9Sound("entity.shulker.hurt");
|
||||
register1_9Sound("entity.shulker.hurt_closed");
|
||||
register1_9Sound("entity.shulker.open");
|
||||
register1_9Sound("entity.shulker.shoot");
|
||||
register1_9Sound("entity.shulker.teleport");
|
||||
register1_9Sound("entity.shulker_bullet.hit");
|
||||
register1_9Sound("entity.shulker_bullet.hurt");
|
||||
register1_9Sound("entity.silverfish.ambient");
|
||||
register1_9Sound("entity.silverfish.death");
|
||||
register1_9Sound("entity.silverfish.hurt");
|
||||
register1_9Sound("entity.silverfish.step");
|
||||
register1_9Sound("entity.skeleton.ambient");
|
||||
register1_9Sound("entity.skeleton.death");
|
||||
register1_9Sound("entity.skeleton.hurt");
|
||||
register1_9Sound("entity.skeleton.shoot");
|
||||
register1_9Sound("entity.skeleton.step");
|
||||
register1_9Sound("entity.skeleton_horse.ambient");
|
||||
register1_9Sound("entity.skeleton_horse.death");
|
||||
register1_9Sound("entity.skeleton_horse.hurt");
|
||||
register1_9Sound("entity.slime.attack");
|
||||
register1_9Sound("entity.slime.death");
|
||||
register1_9Sound("entity.slime.hurt");
|
||||
register1_9Sound("entity.slime.jump");
|
||||
register1_9Sound("entity.slime.squish");
|
||||
register1_9Sound("entity.small_magmacube.death");
|
||||
register1_9Sound("entity.small_magmacube.hurt");
|
||||
register1_9Sound("entity.small_magmacube.squish");
|
||||
register1_9Sound("entity.small_slime.death");
|
||||
register1_9Sound("entity.small_slime.hurt");
|
||||
register1_9Sound("entity.small_slime.jump");
|
||||
register1_9Sound("entity.small_slime.squish");
|
||||
register1_9Sound("entity.snowball.throw");
|
||||
register1_9Sound("entity.snowman.ambient");
|
||||
register1_9Sound("entity.snowman.death");
|
||||
register1_9Sound("entity.snowman.hurt");
|
||||
register1_9Sound("entity.snowman.shoot");
|
||||
register1_9Sound("entity.spider.ambient");
|
||||
register1_9Sound("entity.spider.death");
|
||||
register1_9Sound("entity.spider.hurt");
|
||||
register1_9Sound("entity.spider.step");
|
||||
register1_9Sound("entity.splash_potion.break");
|
||||
register1_9Sound("entity.splash_potion.throw");
|
||||
register1_9Sound("entity.squid.ambient");
|
||||
register1_9Sound("entity.squid.death");
|
||||
register1_9Sound("entity.squid.hurt");
|
||||
register1_9Sound("entity.tnt.primed");
|
||||
register1_9Sound("entity.villager.ambient");
|
||||
register1_9Sound("entity.villager.death");
|
||||
register1_9Sound("entity.villager.hurt");
|
||||
register1_9Sound("entity.villager.no");
|
||||
register1_9Sound("entity.villager.trading");
|
||||
register1_9Sound("entity.villager.yes");
|
||||
register1_9Sound("entity.witch.ambient");
|
||||
register1_9Sound("entity.witch.death");
|
||||
register1_9Sound("entity.witch.drink");
|
||||
register1_9Sound("entity.witch.hurt");
|
||||
register1_9Sound("entity.witch.throw");
|
||||
register1_9Sound("entity.wither.ambient");
|
||||
register1_9Sound("entity.wither.break_block");
|
||||
register1_9Sound("entity.wither.death");
|
||||
register1_9Sound("entity.wither.hurt");
|
||||
register1_9Sound("entity.wither.shoot");
|
||||
register1_9Sound("entity.wither.spawn");
|
||||
register1_9Sound("entity.wolf.ambient");
|
||||
register1_9Sound("entity.wolf.death");
|
||||
register1_9Sound("entity.wolf.growl");
|
||||
register1_9Sound("entity.wolf.howl");
|
||||
register1_9Sound("entity.wolf.hurt");
|
||||
register1_9Sound("entity.wolf.pant");
|
||||
register1_9Sound("entity.wolf.shake");
|
||||
register1_9Sound("entity.wolf.step");
|
||||
register1_9Sound("entity.wolf.whine");
|
||||
register1_9Sound("entity.zombie.ambient");
|
||||
register1_9Sound("entity.zombie.attack_door_wood");
|
||||
register1_9Sound("entity.zombie.attack_iron_door");
|
||||
register1_9Sound("entity.zombie.break_door_wood");
|
||||
register1_9Sound("entity.zombie.death");
|
||||
register1_9Sound("entity.zombie.hurt");
|
||||
register1_9Sound("entity.zombie.infect");
|
||||
register1_9Sound("entity.zombie.step");
|
||||
register1_9Sound("entity.zombie_horse.ambient");
|
||||
register1_9Sound("entity.zombie_horse.death");
|
||||
register1_9Sound("entity.zombie_horse.hurt");
|
||||
register1_9Sound("entity.zombie_pig.ambient");
|
||||
register1_9Sound("entity.zombie_pig.angry");
|
||||
register1_9Sound("entity.zombie_pig.death");
|
||||
register1_9Sound("entity.zombie_pig.hurt");
|
||||
register1_9Sound("entity.zombie_villager.ambient");
|
||||
register1_9Sound("entity.zombie_villager.converted");
|
||||
register1_9Sound("entity.zombie_villager.cure");
|
||||
register1_9Sound("entity.zombie_villager.death");
|
||||
register1_9Sound("entity.zombie_villager.hurt");
|
||||
register1_9Sound("entity.zombie_villager.step");
|
||||
register1_9Sound("item.armor.equip_chain");
|
||||
register1_9Sound("item.armor.equip_diamond");
|
||||
register1_9Sound("item.armor.equip_generic");
|
||||
register1_9Sound("item.armor.equip_gold");
|
||||
register1_9Sound("item.armor.equip_iron");
|
||||
register1_9Sound("item.armor.equip_leather");
|
||||
register1_9Sound("item.bottle.fill");
|
||||
register1_9Sound("item.bottle.fill_dragonbreath");
|
||||
register1_9Sound("item.bucket.empty");
|
||||
register1_9Sound("item.bucket.empty_lava");
|
||||
register1_9Sound("item.bucket.fill");
|
||||
register1_9Sound("item.bucket.fill_lava");
|
||||
register1_9Sound("item.chorus_fruit.teleport");
|
||||
register1_9Sound("item.firecharge.use");
|
||||
register1_9Sound("item.flintandsteel.use");
|
||||
register1_9Sound("item.hoe.till");
|
||||
register1_9Sound("item.shield.block");
|
||||
register1_9Sound("item.shield.break");
|
||||
register1_9Sound("item.shovel.flatten");
|
||||
register1_9Sound("music.creative");
|
||||
register1_9Sound("music.credits");
|
||||
register1_9Sound("music.dragon");
|
||||
register1_9Sound("music.end");
|
||||
register1_9Sound("music.game");
|
||||
register1_9Sound("music.menu");
|
||||
register1_9Sound("music.nether");
|
||||
register1_9Sound("record.11");
|
||||
register1_9Sound("record.13");
|
||||
register1_9Sound("record.blocks");
|
||||
register1_9Sound("record.cat");
|
||||
register1_9Sound("record.chirp");
|
||||
register1_9Sound("record.far");
|
||||
register1_9Sound("record.mall");
|
||||
register1_9Sound("record.mellohi");
|
||||
register1_9Sound("record.stal");
|
||||
register1_9Sound("record.strad");
|
||||
register1_9Sound("record.wait");
|
||||
register1_9Sound("record.ward");
|
||||
register1_9Sound("ui.button.click");
|
||||
register1_9Sound("weather.rain");
|
||||
register1_9Sound("weather.rain.above");
|
||||
}
|
||||
}
|
||||
-191
@@ -1,191 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.storage;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.api.minecraft.EntityModel;
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.data.entity.ClientEntityIdChangeListener;
|
||||
import com.viaversion.viaversion.api.minecraft.Vector;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class EntityTracker extends StoredObject implements ClientEntityIdChangeListener {
|
||||
protected final Protocol1_8To1_9 protocol;
|
||||
private final Map<Integer, List<Integer>> vehicleMap = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, EntityTypes1_10.EntityType> clientEntityTypes = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, List<Metadata>> metadataBuffer = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, EntityModel> entityReplacements = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, Vector> entityOffsets = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, Byte> statusInformation = new ConcurrentHashMap<>();
|
||||
private int playerId;
|
||||
private int playerGamemode = 0;
|
||||
|
||||
public EntityTracker(UserConnection user, Protocol1_8To1_9 protocol) {
|
||||
super(user);
|
||||
|
||||
this.protocol = protocol;
|
||||
}
|
||||
|
||||
public void setPlayerId(int entityId) {
|
||||
playerId = entityId;
|
||||
}
|
||||
|
||||
public int getPlayerId() {
|
||||
return playerId;
|
||||
}
|
||||
|
||||
public int getPlayerGamemode() {
|
||||
return playerGamemode;
|
||||
}
|
||||
|
||||
public void setPlayerGamemode(int playerGamemode) {
|
||||
this.playerGamemode = playerGamemode;
|
||||
}
|
||||
|
||||
public void removeEntity(int entityId) {
|
||||
vehicleMap.remove(entityId);
|
||||
vehicleMap.forEach((vehicle, passengers) -> passengers.remove((Integer) entityId));
|
||||
vehicleMap.entrySet().removeIf(entry -> entry.getValue().isEmpty());
|
||||
clientEntityTypes.remove(entityId);
|
||||
entityOffsets.remove(entityId);
|
||||
if (entityReplacements.containsKey(entityId)) {
|
||||
entityReplacements.remove(entityId).deleteEntity();
|
||||
}
|
||||
}
|
||||
|
||||
public void resetEntityOffset(int entityId) {
|
||||
entityOffsets.remove(entityId);
|
||||
}
|
||||
|
||||
public Vector getEntityOffset(int entityId) {
|
||||
return entityOffsets.get(entityId);
|
||||
}
|
||||
|
||||
public void addToEntityOffset(int entityId, short relX, short relY, short relZ) {
|
||||
entityOffsets.compute(entityId, (key, offset) -> {
|
||||
if (offset == null) {
|
||||
return new Vector(relX, relY, relZ);
|
||||
} else {
|
||||
return new Vector(offset.blockX() + relX, offset.blockY() + relY, offset.blockZ() + relZ);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void setEntityOffset(int entityId, short relX, short relY, short relZ) {
|
||||
entityOffsets.compute(entityId, (key, offset) -> new Vector(relX, relY, relZ));
|
||||
}
|
||||
|
||||
public void setEntityOffset(int entityId, Vector offset) {
|
||||
entityOffsets.put(entityId, offset);
|
||||
}
|
||||
|
||||
public List<Integer> getPassengers(int entityId) {
|
||||
return vehicleMap.getOrDefault(entityId, new ArrayList<>());
|
||||
}
|
||||
|
||||
public void setPassengers(int entityId, List<Integer> passengers) {
|
||||
vehicleMap.put(entityId, passengers);
|
||||
}
|
||||
|
||||
public void addEntityReplacement(EntityModel entityModel) {
|
||||
entityReplacements.put(entityModel.getEntityId(), entityModel);
|
||||
}
|
||||
|
||||
public EntityModel getEntityReplacement(int entityId) {
|
||||
return entityReplacements.get(entityId);
|
||||
}
|
||||
|
||||
public Map<Integer, EntityTypes1_10.EntityType> getClientEntityTypes() {
|
||||
return this.clientEntityTypes;
|
||||
}
|
||||
|
||||
public void addMetadataToBuffer(int entityID, List<Metadata> metadataList) {
|
||||
if (this.metadataBuffer.containsKey(entityID)) {
|
||||
this.metadataBuffer.get(entityID).addAll(metadataList);
|
||||
} else if (!metadataList.isEmpty()) {
|
||||
this.metadataBuffer.put(entityID, metadataList);
|
||||
}
|
||||
}
|
||||
|
||||
public List<Metadata> getBufferedMetadata(int entityId) {
|
||||
return metadataBuffer.get(entityId);
|
||||
}
|
||||
|
||||
public boolean isInsideVehicle(int entityId) {
|
||||
for (List<Integer> vehicle : vehicleMap.values()) {
|
||||
if (vehicle.contains(entityId)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public int getVehicle(int passenger) {
|
||||
for (Map.Entry<Integer, List<Integer>> vehicle : vehicleMap.entrySet()) {
|
||||
if (vehicle.getValue().contains(passenger)) return vehicle.getKey();
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
public boolean isPassenger(int vehicle, int passenger) {
|
||||
return vehicleMap.containsKey(vehicle) && vehicleMap.get(vehicle).contains(passenger);
|
||||
}
|
||||
|
||||
public void sendMetadataBuffer(int entityId) {
|
||||
if (!this.metadataBuffer.containsKey(entityId)) return;
|
||||
if (entityReplacements.containsKey(entityId)) {
|
||||
entityReplacements.get(entityId).updateMetadata(this.metadataBuffer.remove(entityId));
|
||||
} else {
|
||||
PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_8.ENTITY_METADATA, this.getUser());
|
||||
wrapper.write(Type.VAR_INT, entityId);
|
||||
wrapper.write(Types1_8.METADATA_LIST, this.metadataBuffer.get(entityId));
|
||||
protocol.getMetadataRewriter().transform(this, entityId, this.metadataBuffer.get(entityId));
|
||||
if (!this.metadataBuffer.get(entityId).isEmpty()) {
|
||||
try {
|
||||
wrapper.send(Protocol1_8To1_9.class);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
this.metadataBuffer.remove(entityId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientEntityId(int playerEntityId) {
|
||||
clientEntityTypes.remove(this.playerId);
|
||||
this.playerId = playerEntityId;
|
||||
clientEntityTypes.put(this.playerId, EntityTypes1_10.EntityType.ENTITY_HUMAN);
|
||||
}
|
||||
|
||||
public Map<Integer, Byte> getStatusInformation() {
|
||||
return statusInformation;
|
||||
}
|
||||
}
|
||||
-60
@@ -1,60 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.storage;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viarewind.utils.Tickable;
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
|
||||
public class Levitation extends StoredObject implements Tickable {
|
||||
private int amplifier;
|
||||
private volatile boolean active = false;
|
||||
|
||||
public Levitation(UserConnection user) {
|
||||
super(user);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
if (!active) {
|
||||
return;
|
||||
}
|
||||
|
||||
int vY = (amplifier + 1) * 360;
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_8.ENTITY_VELOCITY, null, Levitation.this.getUser());
|
||||
packet.write(Type.VAR_INT, getUser().get(EntityTracker.class).getPlayerId());
|
||||
packet.write(Type.SHORT, (short) 0);
|
||||
packet.write(Type.SHORT, (short) vY);
|
||||
packet.write(Type.SHORT, (short) 0);
|
||||
PacketUtil.sendPacket(packet, Protocol1_8To1_9.class);
|
||||
}
|
||||
|
||||
public void setActive(boolean active) {
|
||||
this.active = active;
|
||||
}
|
||||
|
||||
public void setAmplifier(int amplifier) {
|
||||
this.amplifier = amplifier;
|
||||
}
|
||||
}
|
||||
-133
@@ -1,133 +0,0 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.protocol1_8to1_9.storage;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
|
||||
public class PlayerPosition extends StoredObject {
|
||||
private double posX, posY, posZ;
|
||||
private float yaw, pitch;
|
||||
private boolean onGround;
|
||||
private int confirmId = -1;
|
||||
|
||||
public PlayerPosition(UserConnection user) {
|
||||
super(user);
|
||||
}
|
||||
|
||||
public void setPos(double x, double y, double z) {
|
||||
this.posX = x;
|
||||
this.posY = y;
|
||||
this.posZ = z;
|
||||
}
|
||||
|
||||
public void setYaw(float yaw) {
|
||||
this.yaw = yaw % 360f;
|
||||
}
|
||||
|
||||
public void setPitch(float pitch) {
|
||||
this.pitch = pitch % 360f;
|
||||
}
|
||||
|
||||
public double getPosX() {
|
||||
return this.posX;
|
||||
}
|
||||
|
||||
public double getPosY() {
|
||||
return this.posY;
|
||||
}
|
||||
|
||||
public double getPosZ() {
|
||||
return this.posZ;
|
||||
}
|
||||
|
||||
public float getYaw() {
|
||||
return this.yaw;
|
||||
}
|
||||
|
||||
public float getPitch() {
|
||||
return this.pitch;
|
||||
}
|
||||
|
||||
public boolean isOnGround() {
|
||||
return this.onGround;
|
||||
}
|
||||
|
||||
public int getConfirmId() {
|
||||
return this.confirmId;
|
||||
}
|
||||
|
||||
public void setPosX(double posX) {
|
||||
this.posX = posX;
|
||||
}
|
||||
|
||||
public void setPosY(double posY) {
|
||||
this.posY = posY;
|
||||
}
|
||||
|
||||
public void setPosZ(double posZ) {
|
||||
this.posZ = posZ;
|
||||
}
|
||||
|
||||
public void setOnGround(boolean onGround) {
|
||||
this.onGround = onGround;
|
||||
}
|
||||
|
||||
public void setConfirmId(int confirmId) {
|
||||
this.confirmId = confirmId;
|
||||
}
|
||||
|
||||
public boolean equals(final Object o) {
|
||||
if (o == this) return true;
|
||||
if (!(o instanceof PlayerPosition)) return false;
|
||||
final PlayerPosition other = (PlayerPosition) o;
|
||||
if (!other.canEqual(this)) return false;
|
||||
if (Double.compare(this.getPosX(), other.getPosX()) != 0) return false;
|
||||
if (Double.compare(this.getPosY(), other.getPosY()) != 0) return false;
|
||||
if (Double.compare(this.getPosZ(), other.getPosZ()) != 0) return false;
|
||||
if (Float.compare(this.getYaw(), other.getYaw()) != 0) return false;
|
||||
if (Float.compare(this.getPitch(), other.getPitch()) != 0) return false;
|
||||
if (this.isOnGround() != other.isOnGround()) return false;
|
||||
return this.getConfirmId() == other.getConfirmId();
|
||||
}
|
||||
|
||||
protected boolean canEqual(final Object other) {
|
||||
return other instanceof PlayerPosition;
|
||||
}
|
||||
|
||||
public int hashCode() {
|
||||
final int PRIME = 59;
|
||||
int result = 1;
|
||||
final long $posX = Double.doubleToLongBits(this.getPosX());
|
||||
result = result * PRIME + (int) ($posX >>> 32 ^ $posX);
|
||||
final long $posY = Double.doubleToLongBits(this.getPosY());
|
||||
result = result * PRIME + (int) ($posY >>> 32 ^ $posY);
|
||||
final long $posZ = Double.doubleToLongBits(this.getPosZ());
|
||||
result = result * PRIME + (int) ($posZ >>> 32 ^ $posZ);
|
||||
result = result * PRIME + Float.floatToIntBits(this.getYaw());
|
||||
result = result * PRIME + Float.floatToIntBits(this.getPitch());
|
||||
result = result * PRIME + (this.isOnGround() ? 79 : 97);
|
||||
result = result * PRIME + this.getConfirmId();
|
||||
return result;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return "PlayerPosition(posX=" + this.getPosX() + ", posY=" + this.getPosY() + ", posZ=" + this.getPosZ() + ", yaw=" + this.getYaw() + ", pitch=" + this.getPitch() + ", onGround=" + this.isOnGround() + ", confirmId=" + this.getConfirmId() + ")";
|
||||
}
|
||||
}
|
||||
+116
@@ -0,0 +1,116 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5;
|
||||
|
||||
import com.viaversion.viarewind.api.type.version.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.packet.State;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class Protocol1_7_6_10To1_7_2_5 extends AbstractProtocol<ClientboundPackets1_7_2_5, ClientboundPackets1_7_2_5, ServerboundPackets1_7_2_5, ServerboundPackets1_7_2_5> {
|
||||
|
||||
public static final ValueTransformer<String, String> REMOVE_DASHES = new ValueTransformer<>(Types.STRING) {
|
||||
@Override
|
||||
public String transform(PacketWrapper wrapper, String s) {
|
||||
return s.replace("-", "");
|
||||
}
|
||||
};
|
||||
|
||||
public Protocol1_7_6_10To1_7_2_5() {
|
||||
super(ClientboundPackets1_7_2_5.class, ClientboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.GAME_PROFILE.getId(), ClientboundLoginPackets.GAME_PROFILE.getId(), new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING, REMOVE_DASHES); // Uuid
|
||||
map(Types.STRING); // Name
|
||||
}
|
||||
});
|
||||
|
||||
this.registerClientbound(ClientboundPackets1_7_2_5.ADD_PLAYER, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
map(Types.STRING, REMOVE_DASHES); // Uuid
|
||||
map(Types.STRING); // Name
|
||||
handler(wrapper -> {
|
||||
final int size = wrapper.read(Types.VAR_INT); // Data count
|
||||
for (int i = 0; i < size; i++) {
|
||||
wrapper.read(Types.STRING); // Data name
|
||||
wrapper.read(Types.STRING); // Data value
|
||||
wrapper.read(Types.STRING); // Data signature
|
||||
}
|
||||
});
|
||||
map(Types.INT); // X
|
||||
map(Types.INT); // Y
|
||||
map(Types.INT); // Z
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
map(Types.SHORT); // Item in hand
|
||||
map(Types1_7_6_10.ENTITY_DATA_LIST); // Entity data
|
||||
}
|
||||
});
|
||||
|
||||
this.registerClientbound(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING); // Team name
|
||||
map(Types.BYTE); // Mode
|
||||
handler(wrapper -> {
|
||||
final byte mode = wrapper.get(Types.BYTE, 0);
|
||||
if (mode == 0 || mode == 2) { // Team is created or information is updated
|
||||
wrapper.passthrough(Types.STRING); // Team display name
|
||||
wrapper.passthrough(Types.STRING); // Team prefix
|
||||
wrapper.passthrough(Types.STRING); // Team suffix
|
||||
wrapper.passthrough(Types.BYTE); // Friendly fire
|
||||
}
|
||||
if (mode == 0 || mode == 3 || mode == 4) { // Team is created, player is added or player is removed
|
||||
List<String> entryList = new ArrayList<>();
|
||||
final int size = wrapper.read(Types.SHORT);
|
||||
for (int i = 0; i < size; i++) {
|
||||
entryList.add(wrapper.read(Types.STRING));
|
||||
}
|
||||
|
||||
entryList = entryList.stream()
|
||||
.map(it -> it.length() > 16 ? it.substring(0, 16) : it) // trim to 16 characters
|
||||
.distinct() // remove duplicates
|
||||
.collect(Collectors.toList());
|
||||
|
||||
wrapper.write(Types.SHORT, (short) entryList.size());
|
||||
for (String entry : entryList) {
|
||||
wrapper.write(Types.STRING, entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet;
|
||||
|
||||
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
|
||||
|
||||
public enum ClientboundPackets1_7_2_5 implements ClientboundPacketType {
|
||||
KEEP_ALIVE, // 0x00
|
||||
LOGIN, // 0x01
|
||||
CHAT, // 0x02
|
||||
SET_TIME, // 0x03
|
||||
SET_EQUIPPED_ITEM, // 0x04
|
||||
SET_DEFAULT_SPAWN_POSITION, // 0x05
|
||||
SET_HEALTH, // 0x06
|
||||
RESPAWN, // 0x07
|
||||
PLAYER_POSITION, // 0x08
|
||||
SET_CARRIED_ITEM, // 0x09
|
||||
PLAYER_SLEEP, // 0x0A
|
||||
ANIMATE, // 0x0B
|
||||
ADD_PLAYER, // 0x0C
|
||||
TAKE_ITEM_ENTITY, // 0x0D
|
||||
ADD_ENTITY, // 0x0E
|
||||
ADD_MOB, // 0x0F
|
||||
ADD_PAINTING, // 0x10
|
||||
ADD_EXPERIENCE_ORB, // 0x11
|
||||
SET_ENTITY_MOTION, // 0x12
|
||||
REMOVE_ENTITIES, // 0x13
|
||||
MOVE_ENTITY, // 0x14
|
||||
MOVE_ENTITY_POS, // 0x15
|
||||
MOVE_ENTITY_ROT, // 0x16
|
||||
MOVE_ENTITY_POS_ROT, // 0x17
|
||||
TELEPORT_ENTITY, // 0x18
|
||||
ROTATE_HEAD, // 0x19
|
||||
ENTITY_EVENT, // 0x1A
|
||||
SET_ENTITY_LINK, // 0x1B
|
||||
SET_ENTITY_DATA, // 0x1C
|
||||
UPDATE_MOB_EFFECT, // 0x1D
|
||||
REMOVE_MOB_EFFECT, // 0x1E
|
||||
SET_EXPERIENCE, // 0x1F
|
||||
UPDATE_ATTRIBUTES, // 0x20
|
||||
LEVEL_CHUNK, // 0x21
|
||||
CHUNK_BLOCKS_UPDATE, // 0x22
|
||||
BLOCK_UPDATE, // 0x23
|
||||
BLOCK_EVENT, // 0x24
|
||||
BLOCK_DESTRUCTION, // 0x25
|
||||
MAP_BULK_CHUNK, // 0x26
|
||||
EXPLODE, // 0x27
|
||||
LEVEL_EVENT, // 0x28
|
||||
CUSTOM_SOUND, // 0x29
|
||||
LEVEL_PARTICLES, // 0x2A
|
||||
GAME_EVENT, // 0x2B
|
||||
ADD_GLOBAL_ENTITY, // 0x2C
|
||||
OPEN_SCREEN, // 0x2D
|
||||
CONTAINER_CLOSE, // 0x2E
|
||||
CONTAINER_SET_SLOT, // 0x2F
|
||||
CONTAINER_SET_CONTENT, // 0x30
|
||||
CONTAINER_SET_DATA, // 0x31
|
||||
CONTAINER_ACK, // 0x32
|
||||
UPDATE_SIGN, // 0x33
|
||||
MAP_ITEM_DATA, // 0x34
|
||||
BLOCK_ENTITY_DATA, // 0x35
|
||||
OPEN_SIGN_EDITOR, // 0x36
|
||||
AWARD_STATS, // 0x37
|
||||
PLAYER_INFO, // 0x38
|
||||
PLAYER_ABILITIES, // 0x39
|
||||
COMMAND_SUGGESTIONS, // 0x3A
|
||||
SET_OBJECTIVE, // 0x3B
|
||||
SET_SCORE, // 0x3C
|
||||
SET_DISPLAY_OBJECTIVE, // 0x3D
|
||||
SET_PLAYER_TEAM, // 0x3E
|
||||
CUSTOM_PAYLOAD, // 0x3F
|
||||
DISCONNECT; // 0x40
|
||||
|
||||
@Override
|
||||
public int getId() {
|
||||
return ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name();
|
||||
}
|
||||
}
|
||||
+23
-24
@@ -15,36 +15,35 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
|
||||
package com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet;
|
||||
|
||||
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
|
||||
|
||||
public enum ServerboundPackets1_7_2_5 implements ServerboundPacketType {
|
||||
KEEP_ALIVE, // 0x00
|
||||
CHAT_MESSAGE, // 0x01
|
||||
INTERACT_ENTITY, // 0x02
|
||||
PLAYER_MOVEMENT, // 0x03
|
||||
PLAYER_POSITION, // 0x04
|
||||
PLAYER_ROTATION, // 0x05
|
||||
PLAYER_POSITION_AND_ROTATION, // 0x06
|
||||
PLAYER_DIGGING, // 0x07
|
||||
PLAYER_BLOCK_PLACEMENT, // 0x08
|
||||
HELD_ITEM_CHANGE, // 0x09
|
||||
ANIMATION, // 0x0A
|
||||
ENTITY_ACTION, // 0x0B
|
||||
STEER_VEHICLE, // 0x0C
|
||||
CLOSE_WINDOW, // 0x0D
|
||||
CLICK_WINDOW, // 0x0E
|
||||
WINDOW_CONFIRMATION, // 0x0F
|
||||
CREATIVE_INVENTORY_ACTION, // 0x10
|
||||
CLICK_WINDOW_BUTTON, // 0x11
|
||||
UPDATE_SIGN, // 0x12
|
||||
CHAT, // 0x01
|
||||
INTERACT, // 0x02
|
||||
MOVE_PLAYER_STATUS_ONLY, // 0x03
|
||||
MOVE_PLAYER_POS, // 0x04
|
||||
MOVE_PLAYER_ROT, // 0x05
|
||||
MOVE_PLAYER_POS_ROT, // 0x06
|
||||
PLAYER_ACTION, // 0x07
|
||||
USE_ITEM_ON, // 0x08
|
||||
SET_CARRIED_ITEM, // 0x09
|
||||
SWING, // 0x0A
|
||||
PLAYER_COMMAND, // 0x0B
|
||||
PLAYER_INPUT, // 0x0C
|
||||
CONTAINER_CLOSE, // 0x0D
|
||||
CONTAINER_CLICK, // 0x0E
|
||||
CONTAINER_ACK, // 0x0F
|
||||
SET_CREATIVE_MODE_SLOT, // 0x10
|
||||
CONTAINER_BUTTON_CLICK, // 0x11
|
||||
SIGN_UPDATE, // 0x12
|
||||
PLAYER_ABILITIES, // 0x13
|
||||
TAB_COMPLETE, // 0x14
|
||||
CLIENT_SETTINGS, // 0x15
|
||||
CLIENT_STATUS, // 0x16
|
||||
PLUGIN_MESSAGE; // 0x17
|
||||
COMMAND_SUGGESTION, // 0x14
|
||||
CLIENT_INFORMATION, // 0x15
|
||||
CLIENT_COMMAND, // 0x16
|
||||
CUSTOM_PAYLOAD; // 0x17
|
||||
|
||||
@Override
|
||||
public int getId() {
|
||||
+59
-48
@@ -15,70 +15,69 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8;
|
||||
|
||||
import com.viaversion.viabackwards.api.BackwardsProtocol;
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.api.rewriter.ReplacementItemRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetadataRewriter;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets.*;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.CompressionHandlerProvider;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.compression.TrackingCompressionHandlerProvider;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.rewriter.ReplacementItemRewriter1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.*;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.task.WorldBorderUpdateTask;
|
||||
import com.viaversion.viarewind.api.data.RewindMappingData;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter.EntityPacketRewriter1_8;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter.*;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression.TrackingCompressionHandlerProvider;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.*;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.task.WorldBorderUpdateTask;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.api.platform.providers.ViaProviders;
|
||||
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
|
||||
import com.viaversion.viaversion.api.protocol.packet.Direction;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.packet.State;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.exception.CancelException;
|
||||
import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
|
||||
import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class Protocol1_7_6_10To1_8 extends AbstractProtocol<ClientboundPackets1_8, ClientboundPackets1_7_2_5, ServerboundPackets1_8, ServerboundPackets1_7_2_5> {
|
||||
public class Protocol1_8To1_7_6_10 extends BackwardsProtocol<ClientboundPackets1_8, ClientboundPackets1_7_2_5, ServerboundPackets1_8, ServerboundPackets1_7_2_5> {
|
||||
|
||||
private final ReplacementItemRewriter<Protocol1_7_6_10To1_8> itemRewriter = new ReplacementItemRewriter1_7_6_10(this);
|
||||
private final MetadataRewriter metadataRewriter = new MetadataRewriter(this);
|
||||
public static final RewindMappingData MAPPINGS = new RewindMappingData("1.8", "1.7.10");
|
||||
|
||||
public Protocol1_7_6_10To1_8() {
|
||||
private final BlockItemPacketRewriter1_8 itemRewriter = new BlockItemPacketRewriter1_8(this);
|
||||
private final EntityPacketRewriter1_8 entityRewriter = new EntityPacketRewriter1_8(this);
|
||||
|
||||
public Protocol1_8To1_7_6_10() {
|
||||
super(ClientboundPackets1_8.class, ClientboundPackets1_7_2_5.class, ServerboundPackets1_8.class, ServerboundPackets1_7_2_5.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
itemRewriter.register();
|
||||
entityRewriter.register();
|
||||
|
||||
EntityPackets.register(this);
|
||||
InventoryPackets.register(this);
|
||||
PlayerPackets.register(this);
|
||||
ScoreboardPackets.register(this);
|
||||
SpawnPackets.register(this);
|
||||
WorldPackets.register(this);
|
||||
PlayerPacketRewriter1_8.register(this);
|
||||
ScoreboardPacketRewriter1_8.register(this);
|
||||
WorldPacketRewriter1_8.register(this);
|
||||
|
||||
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.STRING); // server hash
|
||||
map(Type.BYTE_ARRAY_PRIMITIVE, Type.SHORT_BYTE_ARRAY); // public key
|
||||
map(Type.BYTE_ARRAY_PRIMITIVE, Type.SHORT_BYTE_ARRAY); // verification token
|
||||
map(Types.STRING); // server hash
|
||||
map(Types.BYTE_ARRAY_PRIMITIVE, Types.SHORT_BYTE_ARRAY); // public key
|
||||
map(Types.BYTE_ARRAY_PRIMITIVE, Types.SHORT_BYTE_ARRAY); // verification token
|
||||
}
|
||||
});
|
||||
this.registerClientbound(State.LOGIN, ClientboundLoginPackets.LOGIN_COMPRESSION.getId(), ClientboundLoginPackets.LOGIN_COMPRESSION.getId(), new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(wrapper -> {
|
||||
final int threshold = wrapper.read(Type.VAR_INT);
|
||||
final int threshold = wrapper.read(Types.VAR_INT);
|
||||
|
||||
Via.getManager().getProviders().get(CompressionHandlerProvider.class).onHandleLoginCompressionPacket(wrapper.user(), threshold);
|
||||
wrapper.cancel();
|
||||
@@ -89,45 +88,46 @@ public class Protocol1_7_6_10To1_8 extends AbstractProtocol<ClientboundPackets1_
|
||||
this.registerClientbound(ClientboundPackets1_8.KEEP_ALIVE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.VAR_INT, Type.INT); // id
|
||||
map(Types.VAR_INT, Types.INT); // id
|
||||
}
|
||||
});
|
||||
|
||||
this.registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.SHORT_BYTE_ARRAY, Type.BYTE_ARRAY_PRIMITIVE); // shared secret
|
||||
map(Type.SHORT_BYTE_ARRAY, Type.BYTE_ARRAY_PRIMITIVE); // verification token
|
||||
map(Types.SHORT_BYTE_ARRAY, Types.BYTE_ARRAY_PRIMITIVE); // shared secret
|
||||
map(Types.SHORT_BYTE_ARRAY, Types.BYTE_ARRAY_PRIMITIVE); // verification token
|
||||
}
|
||||
});
|
||||
|
||||
this.registerServerbound(ServerboundPackets1_7_2_5.KEEP_ALIVE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Type.INT, Type.VAR_INT); // id
|
||||
map(Types.INT, Types.VAR_INT); // id
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws Exception {
|
||||
public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws CancelException {
|
||||
Via.getManager().getProviders().get(CompressionHandlerProvider.class).onTransformPacket(packetWrapper.user());
|
||||
|
||||
super.transform(direction, state, packetWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(UserConnection userConnection) {
|
||||
userConnection.put(new InventoryTracker(userConnection));
|
||||
userConnection.put(new EntityTracker1_7_6_10(userConnection, metadataRewriter));
|
||||
userConnection.put(new PlayerSessionStorage(userConnection));
|
||||
userConnection.put(new GameProfileStorage(userConnection));
|
||||
userConnection.put(new Scoreboard(userConnection));
|
||||
userConnection.put(new CompressionStatusTracker(userConnection));
|
||||
userConnection.put(new WorldBorderEmulator(userConnection));
|
||||
public void init(UserConnection connection) {
|
||||
connection.addEntityTracker(this.getClass(), new EntityTracker1_8(connection));
|
||||
|
||||
if (!userConnection.has(ClientWorld.class)) {
|
||||
userConnection.put(new ClientWorld());
|
||||
connection.put(new InventoryTracker(connection));
|
||||
connection.put(new PlayerSessionStorage(connection));
|
||||
connection.put(new GameProfileStorage(connection));
|
||||
connection.put(new ScoreboardTracker(connection));
|
||||
connection.put(new CompressionStatusTracker(connection));
|
||||
connection.put(new WorldBorderEmulator(connection));
|
||||
|
||||
if (!connection.has(ClientWorld.class)) {
|
||||
connection.put(new ClientWorld());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,11 +141,22 @@ public class Protocol1_7_6_10To1_8 extends AbstractProtocol<ClientboundPackets1_
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReplacementItemRewriter<Protocol1_7_6_10To1_8> getItemRewriter() {
|
||||
public RewindMappingData getMappingData() {
|
||||
return MAPPINGS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockItemPacketRewriter1_8 getItemRewriter() {
|
||||
return itemRewriter;
|
||||
}
|
||||
|
||||
public MetadataRewriter getMetadataRewriter() {
|
||||
return metadataRewriter;
|
||||
@Override
|
||||
public EntityPacketRewriter1_8 getEntityRewriter() {
|
||||
return entityRewriter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasMappingDataToLoad() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+219
@@ -0,0 +1,219 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
|
||||
|
||||
import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
|
||||
import com.viaversion.viaversion.util.Pair;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Optional;
|
||||
|
||||
import static com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8.EntityType.*;
|
||||
|
||||
public enum EntityDataIndex1_7_6_10 {
|
||||
|
||||
ENTITY_FLAGS(ENTITY, 0, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
ENTITY_AIR(ENTITY, 1, EntityDataTypes1_7_6_10.SHORT, EntityDataTypes1_8.SHORT),
|
||||
ENTITY_NAME_TAG(ENTITY, -1, null, 2, EntityDataTypes1_8.STRING),
|
||||
ENTITY_NAME_TAG_VISIBILITY(ENTITY, -1, null, 3, EntityDataTypes1_8.BYTE),
|
||||
ENTITY_SILENT(ENTITY, -1, null, 4, EntityDataTypes1_8.BYTE),
|
||||
|
||||
LIVING_ENTITY_BASE_HEALTH(LIVING_ENTITY_BASE, 6, EntityDataTypes1_7_6_10.FLOAT, EntityDataTypes1_8.FLOAT),
|
||||
LIVING_ENTITY_BASE_POTION_EFFECT_COLOR(LIVING_ENTITY_BASE, 7, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
LIVING_ENTITY_BASE_IS_POTION_EFFECT_AMBIENT(LIVING_ENTITY_BASE, 8, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
LIVING_ENTITY_BASE_ARROWS(LIVING_ENTITY_BASE, 9, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
LIVING_ENTITY_BASE_NAME_TAG(LIVING_ENTITY_BASE, 10, EntityDataTypes1_7_6_10.STRING, 2, EntityDataTypes1_8.STRING),
|
||||
LIVING_ENTITY_BASE_NAME_TAG_VISIBILITY(LIVING_ENTITY_BASE, 11, EntityDataTypes1_7_6_10.BYTE, 3, EntityDataTypes1_8.BYTE),
|
||||
|
||||
LIVING_ENTITY_AI(LIVING_ENTITY, -1, null, 15, EntityDataTypes1_8.BYTE),
|
||||
|
||||
ABSTRACT_AGEABLE_AGE(ABSTRACT_AGEABLE, 12, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.BYTE),
|
||||
|
||||
ARMOR_STAND_FLAGS(ARMOR_STAND, -1, null, 10, EntityDataTypes1_8.BYTE),
|
||||
ARMOR_STAND_HEAD_POSITION(ARMOR_STAND, -1, null, 11, EntityDataTypes1_8.ROTATIONS),
|
||||
ARMOR_STAND_BODY_POSITION(ARMOR_STAND, -1, null, 12, EntityDataTypes1_8.ROTATIONS),
|
||||
ARMOR_STAND_LEFT_ARM_POSITION(ARMOR_STAND, -1, null, 13, EntityDataTypes1_8.ROTATIONS),
|
||||
ARMOR_STAND_RIGHT_ARM_POSITION(ARMOR_STAND, -1, null, 14, EntityDataTypes1_8.ROTATIONS),
|
||||
ARMOR_STAND_LEFT_LEG_POSITION(ARMOR_STAND, -1, null, 15, EntityDataTypes1_8.ROTATIONS),
|
||||
ARMOR_STAND_RIGHT_LEG_POSITION(ARMOR_STAND, -1, null, 16, EntityDataTypes1_8.ROTATIONS),
|
||||
|
||||
PLAYER_SKIN_FLAGS(PLAYER, 16, EntityDataTypes1_7_6_10.BYTE, 10, EntityDataTypes1_8.BYTE),
|
||||
PLAYER_UNUSED(PLAYER, -1, null, 16, EntityDataTypes1_8.BYTE),
|
||||
PLAYER_ABSORPTION_HEATS(PLAYER, 17, EntityDataTypes1_7_6_10.FLOAT, EntityDataTypes1_8.FLOAT),
|
||||
PLAYER_SCORE(PLAYER, 18, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
|
||||
HORSE_FLAGS(HORSE, 16, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
HORSE_TYPE(HORSE, 19, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
HORSE_COLOR(HORSE, 20, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
HORSE_OWNER(HORSE, 21, EntityDataTypes1_7_6_10.STRING, EntityDataTypes1_8.STRING),
|
||||
HORSE_ARMOR(HORSE, 22, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
|
||||
BAT_HANGING(BAT, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
TAMABLE_ANIMAL_FLAGS(TAMABLE_ANIMAL, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
TAMABLE_ANIMAL_OWNER(TAMABLE_ANIMAL, 17, EntityDataTypes1_7_6_10.STRING, EntityDataTypes1_8.STRING),
|
||||
|
||||
OCELOT_TYPE(OCELOT, 18, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
WOLF_FLAGS(WOLF, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
WOLF_HEALTH(WOLF, 18, EntityDataTypes1_7_6_10.FLOAT, EntityDataTypes1_8.FLOAT),
|
||||
WOLF_BEGGING(WOLF, 19, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
WOLF_COLLAR_COLOR(WOLF, 20, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
PIG_SADDLE(PIG, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
SHEEP_COLOR_OR_SHEARED(SHEEP, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
VILLAGER_TYPE(VILLAGER, 16, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
|
||||
ENDERMAN_CARRIED_BLOCK(ENDERMAN, 16, null, EntityDataTypes1_8.SHORT),
|
||||
ENDERMAN_CARRIED_BLOCK_DATA(ENDERMAN, 17, null, EntityDataTypes1_8.BYTE),
|
||||
ENDERMAN_IS_SCREAMING(ENDERMAN, 18, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
ZOMBIE_CHILD(ZOMBIE, 12, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
ZOMBIE_VILLAGER(ZOMBIE, 13, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
ZOMBIE_CONVERTING(ZOMBIE, 14, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
BLAZE_ON_FIRE(BLAZE, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
SPIDER_CLIMBING(SPIDER, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
CREEPER_STATE(CREEPER, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
CREEPER_POWERED(CREEPER, 17, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
CREEPER_IGNITED(CREEPER, 18, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
GHAST_STATE(GHAST, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
GHAST_IS_POWERED(GHAST, 17, null, EntityDataTypes1_8.BYTE),
|
||||
|
||||
SLIME_SIZE(SLIME, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
SKELETON_TYPE(SKELETON, 13, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
WITCH_AGGRESSIVE(WITCH, 21, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
IRON_GOLEM_IS_PLAYER_CREATED(IRON_GOLEM, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
WITHER_WATCHED_TARGET_1(WITHER, 17, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
WITHER_WATCHED_TARGET_2(WITHER, 18, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
WITHER_WATCHED_TARGET_3(WITHER, 19, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
WITHER_INVULNERABLE_TIME(WITHER, 20, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
|
||||
GUARDIAN_FLAGS(GUARDIAN, 16, null, EntityDataTypes1_8.BYTE),
|
||||
GUARDIAN_TARGET(GUARDIAN, 17, null, EntityDataTypes1_8.INT),
|
||||
|
||||
BOAT_TIME_SINCE_HIT(BOAT, 17, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
BOAT_FORWARD_DIRECTION(BOAT, 18, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
BOAT_DAMAGE_TAKEN(BOAT, 19, EntityDataTypes1_7_6_10.FLOAT, EntityDataTypes1_8.FLOAT),
|
||||
|
||||
ABSTRACT_MINECART_SHAKING_POWER(ABSTRACT_MINECART, 17, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
ABSTRACT_MINECART_SHAKING_DIRECTION(ABSTRACT_MINECART, 18, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
ABSTRACT_MINECART_DAMAGE_TAKEN(ABSTRACT_MINECART, 19, EntityDataTypes1_7_6_10.FLOAT, EntityDataTypes1_8.FLOAT),
|
||||
ABSTRACT_MINECART_BLOCK_INSIDE(ABSTRACT_MINECART, 20, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
ABSTRACT_MINECART_BLOCK_Y(ABSTRACT_MINECART, 21, EntityDataTypes1_7_6_10.INT, EntityDataTypes1_8.INT),
|
||||
ABSTRACT_MINECART_SHOW_BLOCK(ABSTRACT_MINECART, 22, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
FURNACE_MINECART_IS_POWERED(FURNACE_MINECART, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
ITEM_ITEM(ITEM, 10, EntityDataTypes1_7_6_10.ITEM, EntityDataTypes1_8.ITEM),
|
||||
|
||||
ARROW_IS_CRITICAL(ARROW, 16, EntityDataTypes1_7_6_10.BYTE, EntityDataTypes1_8.BYTE),
|
||||
|
||||
FIREWORK_ROCKET_INFO(FIREWORK_ROCKET, 8, EntityDataTypes1_7_6_10.ITEM, EntityDataTypes1_8.ITEM),
|
||||
|
||||
ITEM_FRAME_ITEM(ITEM_FRAME, 2, EntityDataTypes1_7_6_10.ITEM, 8, EntityDataTypes1_8.ITEM),
|
||||
ITEM_FRAME_ROTATION(ITEM_FRAME, 3, EntityDataTypes1_7_6_10.BYTE, 9, EntityDataTypes1_8.BYTE),
|
||||
|
||||
END_CRYSTAL_HEALTH(END_CRYSTAL, 8, EntityDataTypes1_7_6_10.INT, 9, EntityDataTypes1_8.INT);
|
||||
|
||||
private static final HashMap<Pair<EntityTypes1_8.EntityType, Integer>, EntityDataIndex1_7_6_10> ENTITY_DATA_REWRITES = new HashMap<>();
|
||||
|
||||
static {
|
||||
for (EntityDataIndex1_7_6_10 index : EntityDataIndex1_7_6_10.values()) {
|
||||
ENTITY_DATA_REWRITES.put(new Pair<>(index.getClazz(), index.getNewIndex()), index);
|
||||
}
|
||||
}
|
||||
|
||||
private final EntityTypes1_8.EntityType clazz;
|
||||
private final int newIndex;
|
||||
private final EntityDataTypes1_8 newType;
|
||||
private final EntityDataTypes1_7_6_10 oldType;
|
||||
private final int index;
|
||||
|
||||
EntityDataIndex1_7_6_10(EntityTypes1_8.EntityType type, int index, EntityDataTypes1_7_6_10 oldType, EntityDataTypes1_8 newType) {
|
||||
this.clazz = type;
|
||||
this.index = index;
|
||||
this.newIndex = index;
|
||||
this.oldType = oldType;
|
||||
this.newType = newType;
|
||||
}
|
||||
|
||||
EntityDataIndex1_7_6_10(EntityTypes1_8.EntityType type, int index, EntityDataTypes1_7_6_10 oldType, int newIndex, EntityDataTypes1_8 newType) {
|
||||
this.clazz = type;
|
||||
this.index = index;
|
||||
this.oldType = oldType;
|
||||
this.newIndex = newIndex;
|
||||
this.newType = newType;
|
||||
}
|
||||
|
||||
private static Optional<EntityDataIndex1_7_6_10> getIndex(EntityType type, int index) {
|
||||
Pair<EntityType, Integer> pair = new Pair<>(type, index);
|
||||
if (ENTITY_DATA_REWRITES.containsKey(pair)) {
|
||||
return Optional.of(ENTITY_DATA_REWRITES.get(pair));
|
||||
}
|
||||
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
public EntityTypes1_8.EntityType getClazz() {
|
||||
return clazz;
|
||||
}
|
||||
|
||||
public int getNewIndex() {
|
||||
return newIndex;
|
||||
}
|
||||
|
||||
public EntityDataTypes1_8 getNewType() {
|
||||
return newType;
|
||||
}
|
||||
|
||||
public EntityDataTypes1_7_6_10 getOldType() {
|
||||
return oldType;
|
||||
}
|
||||
|
||||
public int getIndex() {
|
||||
return index;
|
||||
}
|
||||
|
||||
public static EntityDataIndex1_7_6_10 searchIndex(EntityType type, int index) {
|
||||
EntityType currentType = type;
|
||||
do {
|
||||
Optional<EntityDataIndex1_7_6_10> optMeta = getIndex(currentType, index);
|
||||
|
||||
if (optMeta.isPresent()) {
|
||||
return optMeta.get();
|
||||
}
|
||||
|
||||
currentType = currentType.getParent();
|
||||
} while (currentType != null);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+10
-11
@@ -15,12 +15,11 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.rewriter;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public enum ParticleIndex1_7_6_10 {
|
||||
public enum Particles1_8 {
|
||||
EXPLOSION_NORMAL("explode"),
|
||||
EXPLOSION_LARGE("largeexplode"),
|
||||
EXPLOSION_HUGE("hugeexplosion"),
|
||||
@@ -66,31 +65,31 @@ public enum ParticleIndex1_7_6_10 {
|
||||
|
||||
public final String name;
|
||||
public final int extra;
|
||||
private final static HashMap<String, ParticleIndex1_7_6_10> particleMap = new HashMap<>();
|
||||
private static final HashMap<String, Particles1_8> particleMap = new HashMap<>();
|
||||
|
||||
ParticleIndex1_7_6_10(String name) {
|
||||
Particles1_8(String name) {
|
||||
this(name, 0);
|
||||
}
|
||||
|
||||
ParticleIndex1_7_6_10(String name, int extra) {
|
||||
Particles1_8(String name, int extra) {
|
||||
this.name = name;
|
||||
this.extra = extra;
|
||||
}
|
||||
|
||||
public static ParticleIndex1_7_6_10 find(String part) {
|
||||
public static Particles1_8 find(String part) {
|
||||
return particleMap.get(part);
|
||||
}
|
||||
|
||||
public static ParticleIndex1_7_6_10 find(int id) {
|
||||
public static Particles1_8 find(int id) {
|
||||
if (id < 0) return null;
|
||||
ParticleIndex1_7_6_10[] values = ParticleIndex1_7_6_10.values();
|
||||
Particles1_8[] values = Particles1_8.values();
|
||||
return id >= values.length ? null : values[id];
|
||||
}
|
||||
|
||||
static {
|
||||
ParticleIndex1_7_6_10[] particles = values();
|
||||
Particles1_8[] particles = values();
|
||||
|
||||
for (ParticleIndex1_7_6_10 particle : particles) {
|
||||
for (Particles1_8 particle : particles) {
|
||||
particleMap.put(particle.name, particle);
|
||||
}
|
||||
}
|
||||
+325
@@ -0,0 +1,325 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
|
||||
|
||||
import com.viaversion.viarewind.api.type.version.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter.EntityPacketRewriter1_8;
|
||||
import com.viaversion.viarewind.api.minecraft.math.AABB;
|
||||
import com.viaversion.viarewind.api.minecraft.math.Vector3d;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.data.entity.TrackedEntityImpl;
|
||||
import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEvent;
|
||||
import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEventImpl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class VirtualHologramEntity {
|
||||
private final List<EntityData> entityDataTracker = new ArrayList<>();
|
||||
private double locX, locY, locZ;
|
||||
|
||||
private final UserConnection user;
|
||||
private final int entityId;
|
||||
|
||||
private int[] entityIds = null;
|
||||
private State currentState = null;
|
||||
private String name = null;
|
||||
private float yaw, pitch;
|
||||
private float headYaw;
|
||||
private boolean small = false;
|
||||
private boolean marker = false;
|
||||
|
||||
public VirtualHologramEntity(final UserConnection user, final int entityId) {
|
||||
this.user = user;
|
||||
this.entityId = entityId;
|
||||
}
|
||||
|
||||
public void setPosition(final double x, final double y, final double z) {
|
||||
if (x == this.locX && y == this.locY && z == this.locZ) return;
|
||||
this.locX = x;
|
||||
this.locY = y;
|
||||
this.locZ = z;
|
||||
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void setRelativePosition(final double x, final double y, final double z) {
|
||||
if (x == 0.0 && y == 0.0 && z == 0.0) return;
|
||||
this.locX += x;
|
||||
this.locY += y;
|
||||
this.locZ += z;
|
||||
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void setRotation(final float yaw, final float pitch) {
|
||||
if (this.yaw == yaw || this.headYaw == yaw || this.pitch == pitch) return;
|
||||
this.yaw = yaw;
|
||||
this.headYaw = yaw;
|
||||
this.pitch = pitch;
|
||||
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void setHeadYaw(float yaw) {
|
||||
if (this.headYaw == yaw) return;
|
||||
this.headYaw = yaw;
|
||||
|
||||
updateLocation(false);
|
||||
}
|
||||
|
||||
public void syncState(final EntityPacketRewriter1_8 entityRewriter, final List<EntityData> entityDataList) {
|
||||
// Merge entity data updates into current tracker
|
||||
for (EntityData entityData : entityDataList) {
|
||||
entityDataTracker.removeIf(m -> m.id() == entityData.id());
|
||||
entityDataTracker.add(entityData);
|
||||
}
|
||||
|
||||
// Filter armor stand data to calculate emulation
|
||||
byte flags = 0;
|
||||
byte armorStandFlags = 0;
|
||||
for (EntityData entityData : entityDataTracker) {
|
||||
if (entityData.id() == 0 && entityData.dataType() == EntityDataTypes1_8.BYTE) {
|
||||
flags = ((Number) entityData.getValue()).byteValue();
|
||||
} else if (entityData.id() == 2 && entityData.dataType() == EntityDataTypes1_8.STRING) {
|
||||
name = entityData.getValue().toString();
|
||||
if (name != null && name.isEmpty()) name = null;
|
||||
} else if (entityData.id() == 10 && entityData.dataType() == EntityDataTypes1_8.BYTE) {
|
||||
armorStandFlags = ((Number) entityData.getValue()).byteValue();
|
||||
}
|
||||
}
|
||||
final boolean invisible = (flags & 0x20) != 0;
|
||||
small = (armorStandFlags & 0x01) != 0;
|
||||
marker = (armorStandFlags & 0x10) != 0;
|
||||
|
||||
State prevState = currentState;
|
||||
if (invisible && name != null) {
|
||||
currentState = State.HOLOGRAM;
|
||||
} else {
|
||||
currentState = State.ZOMBIE;
|
||||
}
|
||||
|
||||
if (currentState != prevState) {
|
||||
deleteEntity();
|
||||
sendSpawnPacket(entityRewriter);
|
||||
} else {
|
||||
sendEntityDataUpdate(entityRewriter);
|
||||
updateLocation(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateLocation(final boolean remount) {
|
||||
if (entityIds == null) {
|
||||
return;
|
||||
}
|
||||
if (currentState == State.ZOMBIE) {
|
||||
teleportEntity(entityId, locX, locY, locZ, yaw, pitch);
|
||||
|
||||
final PacketWrapper entityHeadLook = PacketWrapper.create(ClientboundPackets1_7_2_5.ROTATE_HEAD, user);
|
||||
|
||||
entityHeadLook.write(Types.INT, entityId);
|
||||
entityHeadLook.write(Types.BYTE, (byte) ((headYaw / 360f) * 256));
|
||||
|
||||
entityHeadLook.send(Protocol1_8To1_7_6_10.class);
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
if (remount) {
|
||||
PacketWrapper detach = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_LINK, user);
|
||||
detach.write(Types.INT, entityIds[1]);
|
||||
detach.write(Types.INT, -1);
|
||||
detach.write(Types.BOOLEAN, false);
|
||||
detach.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
// Don't ask me where this offset is coming from
|
||||
teleportEntity(entityIds[0], locX, (locY + (marker ? 54.85 : small ? 56 : 57) - 0.16), locZ, 0, 0); // Skull
|
||||
|
||||
if (remount) {
|
||||
teleportEntity(entityIds[1], locX, locY + 56.75, locZ, 0, 0); // Horse
|
||||
|
||||
PacketWrapper attach = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_LINK, null, user);
|
||||
attach.write(Types.INT, entityIds[1]);
|
||||
attach.write(Types.INT, entityIds[0]);
|
||||
attach.write(Types.BOOLEAN, false);
|
||||
attach.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void teleportEntity(final int entityId, final double x, final double y, final double z, final float yaw, final float pitch) {
|
||||
final PacketWrapper entityTeleport = PacketWrapper.create(ClientboundPackets1_7_2_5.TELEPORT_ENTITY, user);
|
||||
|
||||
entityTeleport.write(Types.INT, entityId); // entity id
|
||||
entityTeleport.write(Types.INT, (int) (x * 32.0)); // x
|
||||
entityTeleport.write(Types.INT, (int) (y * 32.0)); // y
|
||||
entityTeleport.write(Types.INT, (int) (z * 32.0)); // z
|
||||
entityTeleport.write(Types.BYTE, (byte) ((yaw / 360f) * 256)); // yaw
|
||||
entityTeleport.write(Types.BYTE, (byte) ((pitch / 360f) * 256)); // pitch
|
||||
|
||||
entityTeleport.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
protected void spawnEntity(final int entityId, final int type, final double locX, final double locY, final double locZ) {
|
||||
final PacketWrapper addMob = PacketWrapper.create(ClientboundPackets1_7_2_5.ADD_MOB, user);
|
||||
|
||||
addMob.write(Types.VAR_INT, entityId); // Entity id
|
||||
addMob.write(Types.UNSIGNED_BYTE, (short) type); // Entity type
|
||||
addMob.write(Types.INT, (int) (locX * 32.0)); // X
|
||||
addMob.write(Types.INT, (int) (locY * 32.0)); // Y
|
||||
addMob.write(Types.INT, (int) (locZ * 32.0)); // Z
|
||||
addMob.write(Types.BYTE, (byte) 0); // Yaw
|
||||
addMob.write(Types.BYTE, (byte) 0); // Pitch
|
||||
addMob.write(Types.BYTE, (byte) 0); // Head pitch
|
||||
addMob.write(Types.SHORT, (short) 0); // Velocity x
|
||||
addMob.write(Types.SHORT, (short) 0); // Velocity y
|
||||
addMob.write(Types.SHORT, (short) 0); // Velocity z
|
||||
addMob.write(Types1_7_6_10.ENTITY_DATA_LIST, new ArrayList<>()); // Entity data
|
||||
|
||||
addMob.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
public void sendEntityDataUpdate(final EntityPacketRewriter1_8 entityRewriter) {
|
||||
if (entityIds == null) {
|
||||
return;
|
||||
}
|
||||
final PacketWrapper setEntityData = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_DATA, user);
|
||||
|
||||
if (currentState == State.ZOMBIE) {
|
||||
writeZombieMeta(entityRewriter, setEntityData);
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
writeHologramMeta(setEntityData);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
setEntityData.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
private void writeZombieMeta(final EntityPacketRewriter1_8 entityRewriter, PacketWrapper wrapper) {
|
||||
wrapper.write(Types.INT, entityIds[0]);
|
||||
|
||||
// Filter entity data sent by the server and convert them together with our custom entity data
|
||||
final List<EntityData> entityDataList = new ArrayList<>();
|
||||
for (EntityData entityData : entityDataTracker) {
|
||||
// Remove non existent entityData
|
||||
if (entityData.id() < 0 || entityData.id() > 9) {
|
||||
continue;
|
||||
}
|
||||
entityDataList.add(new EntityData(entityData.id(), entityData.dataType(), entityData.getValue()));
|
||||
}
|
||||
if (small) {
|
||||
entityDataList.add(new EntityData(12, EntityDataTypes1_8.BYTE, (byte) 1));
|
||||
}
|
||||
|
||||
// Push entity data from the server through entity data conversion 1.7->1.8
|
||||
for (EntityData entityData : entityDataList.toArray(new EntityData[0])) {
|
||||
final EntityDataHandlerEvent event = new EntityDataHandlerEventImpl(wrapper.user(), new TrackedEntityImpl(EntityTypes1_8.EntityType.ZOMBIE), -1, entityData, entityDataList);
|
||||
try {
|
||||
entityRewriter.handleEntityData(event, entityData);
|
||||
} catch (Exception e) {
|
||||
entityDataList.remove(entityData);
|
||||
break;
|
||||
}
|
||||
if (event.cancelled()) {
|
||||
entityDataList.remove(entityData);
|
||||
break;
|
||||
}
|
||||
}
|
||||
wrapper.write(Types1_7_6_10.ENTITY_DATA_LIST, entityDataList);
|
||||
}
|
||||
|
||||
private void writeHologramMeta(PacketWrapper wrapper) {
|
||||
wrapper.write(Types.INT, entityIds[1]);
|
||||
|
||||
// Directly write 1.7 entity data here since we are making them up
|
||||
final List<EntityData> entityDataList = new ArrayList<>();
|
||||
entityDataList.add(new EntityData(EntityDataIndex1_7_6_10.ABSTRACT_AGEABLE_AGE.getIndex(), EntityDataTypes1_7_6_10.INT, -1700000));
|
||||
entityDataList.add(new EntityData(EntityDataIndex1_7_6_10.LIVING_ENTITY_BASE_NAME_TAG.getIndex(), EntityDataTypes1_7_6_10.STRING, name));
|
||||
entityDataList.add(new EntityData(EntityDataIndex1_7_6_10.LIVING_ENTITY_BASE_NAME_TAG_VISIBILITY.getIndex(), EntityDataTypes1_7_6_10.BYTE, (byte) 1));
|
||||
|
||||
wrapper.write(Types1_7_6_10.ENTITY_DATA_LIST, entityDataList);
|
||||
}
|
||||
|
||||
public void sendSpawnPacket(final EntityPacketRewriter1_8 entityRewriter) {
|
||||
if (entityIds != null) {
|
||||
deleteEntity();
|
||||
}
|
||||
if (currentState == State.ZOMBIE) {
|
||||
spawnEntity(entityId, EntityTypes1_8.EntityType.ZOMBIE.getId(), locX, locY, locZ);
|
||||
|
||||
entityIds = new int[]{entityId};
|
||||
} else if (currentState == State.HOLOGRAM) {
|
||||
final int[] entityIds = { entityId, additionalEntityId() };
|
||||
|
||||
final PacketWrapper spawnSkull = PacketWrapper.create(ClientboundPackets1_7_2_5.ADD_ENTITY, user);
|
||||
spawnSkull.write(Types.VAR_INT, entityIds[0]);
|
||||
spawnSkull.write(Types.BYTE, (byte) 66);
|
||||
spawnSkull.write(Types.INT, (int) (locX * 32.0));
|
||||
spawnSkull.write(Types.INT, (int) (locY * 32.0));
|
||||
spawnSkull.write(Types.INT, (int) (locZ * 32.0));
|
||||
spawnSkull.write(Types.BYTE, (byte) 0);
|
||||
spawnSkull.write(Types.BYTE, (byte) 0);
|
||||
spawnSkull.write(Types.INT, 0);
|
||||
spawnSkull.send(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
spawnEntity(entityIds[1], EntityTypes1_8.EntityType.HORSE.getId(), locX, locY, locZ); // Horse
|
||||
|
||||
this.entityIds = entityIds;
|
||||
}
|
||||
|
||||
sendEntityDataUpdate(entityRewriter);
|
||||
updateLocation(true);
|
||||
}
|
||||
|
||||
public AABB getBoundingBox() {
|
||||
final double width = this.small ? 0.25 : 0.5;
|
||||
final double height = this.small ? 0.9875 : 1.975;
|
||||
|
||||
final Vector3d min = new Vector3d(this.locX - width / 2, this.locY, this.locZ - width / 2);
|
||||
final Vector3d max = new Vector3d(this.locX + width / 2, this.locY + height, this.locZ + width / 2);
|
||||
|
||||
return new AABB(min, max);
|
||||
}
|
||||
|
||||
private int additionalEntityId() {
|
||||
return Integer.MAX_VALUE - 16000 - entityId;
|
||||
}
|
||||
|
||||
public void deleteEntity() {
|
||||
if (entityIds == null) {
|
||||
return;
|
||||
}
|
||||
final PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, user);
|
||||
despawn.write(Types.BYTE, (byte) entityIds.length);
|
||||
for (int id : entityIds) {
|
||||
despawn.write(Types.INT, id);
|
||||
}
|
||||
entityIds = null;
|
||||
despawn.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
private enum State {
|
||||
HOLOGRAM, ZOMBIE
|
||||
}
|
||||
}
|
||||
+2
-3
@@ -15,10 +15,9 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.CompressionStatusTracker;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.CompressionStatusTracker;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.platform.providers.Provider;
|
||||
import io.netty.channel.ChannelHandler;
|
||||
+2
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider;
|
||||
|
||||
import com.viaversion.viaversion.api.platform.providers.Provider;
|
||||
|
||||
@@ -25,6 +24,7 @@ import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
// TODO I believe this should be a storage?
|
||||
public abstract class TitleRenderProvider implements Provider {
|
||||
protected Map<UUID, Integer> fadeIn = new HashMap<>();
|
||||
protected Map<UUID, Integer> stay = new HashMap<>();
|
||||
+3
-5
@@ -15,10 +15,9 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.compression;
|
||||
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
@@ -28,7 +27,6 @@ import io.netty.handler.codec.MessageToMessageDecoder;
|
||||
import java.util.List;
|
||||
import java.util.zip.Inflater;
|
||||
|
||||
// https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionDecoder.java
|
||||
public class CompressionDecoder extends MessageToMessageDecoder<ByteBuf> {
|
||||
private final Inflater inflater = new Inflater();
|
||||
|
||||
@@ -42,7 +40,7 @@ public class CompressionDecoder extends MessageToMessageDecoder<ByteBuf> {
|
||||
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||
if (!in.isReadable()) return;
|
||||
|
||||
int outLength = Type.VAR_INT.readPrimitive(in);
|
||||
int outLength = Types.VAR_INT.readPrimitive(in);
|
||||
if (outLength == 0) {
|
||||
out.add(in.readBytes(in.readableBytes()));
|
||||
return;
|
||||
+3
-5
@@ -15,10 +15,9 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.compression;
|
||||
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
@@ -26,7 +25,6 @@ import io.netty.handler.codec.MessageToByteEncoder;
|
||||
|
||||
import java.util.zip.Deflater;
|
||||
|
||||
// https://github.com/Gerrygames/ClientViaVersion/blob/master/src/main/java/de/gerrygames/the5zig/clientviaversion/netty/CompressionEncoder.java
|
||||
public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
|
||||
private final Deflater deflater = new Deflater();
|
||||
|
||||
@@ -45,7 +43,7 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
|
||||
return;
|
||||
}
|
||||
|
||||
Type.VAR_INT.writePrimitive(out, frameLength);
|
||||
Types.VAR_INT.writePrimitive(out, frameLength);
|
||||
|
||||
ByteBuf temp = in;
|
||||
if (!in.hasArray()) {
|
||||
+6
-7
@@ -15,20 +15,19 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.compression;
|
||||
|
||||
import com.viaversion.viarewind.api.netty.EmptyChannelHandler;
|
||||
import com.viaversion.viarewind.api.netty.ForwardMessageToByteEncoder;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.CompressionHandlerProvider;
|
||||
import com.viaversion.viarewind.api.minecraft.netty.EmptyChannelHandler;
|
||||
import com.viaversion.viarewind.api.minecraft.netty.ForwardMessageToByteEncoder;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import io.netty.channel.ChannelHandler;
|
||||
import io.netty.channel.ChannelPipeline;
|
||||
|
||||
public class TrackingCompressionHandlerProvider extends CompressionHandlerProvider {
|
||||
public final static String COMPRESS_HANDLER_NAME = "compress";
|
||||
public final static String DECOMPRESS_HANDLER_NAME = "decompress";
|
||||
public static final String COMPRESS_HANDLER_NAME = "compress";
|
||||
public static final String DECOMPRESS_HANDLER_NAME = "decompress";
|
||||
|
||||
@Override
|
||||
public void onHandleLoginCompressionPacket(UserConnection user, int threshold) {
|
||||
+321
@@ -0,0 +1,321 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
|
||||
|
||||
import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter;
|
||||
import com.viaversion.viarewind.api.rewriter.VRBlockItemRewriter;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.GameProfileStorage;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.InventoryTracker;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.libs.gson.JsonElement;
|
||||
import com.viaversion.nbt.tag.*;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class BlockItemPacketRewriter1_8 extends VRBlockItemRewriter<ClientboundPackets1_8, ServerboundPackets1_7_2_5, Protocol1_8To1_7_6_10> {
|
||||
|
||||
private LegacyEnchantmentRewriter enchantmentRewriter;
|
||||
|
||||
public BlockItemPacketRewriter1_8(Protocol1_8To1_7_6_10 protocol) {
|
||||
super(protocol, "1.8");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.OPEN_SCREEN, wrapper -> {
|
||||
final InventoryTracker windowTracker = wrapper.user().get(InventoryTracker.class);
|
||||
|
||||
final short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE); // Window id
|
||||
final short windowTypeId = InventoryTracker.getInventoryType(wrapper.read(Types.STRING)); // Window type
|
||||
|
||||
windowTracker.getWindowTypeMap().put(windowId, windowTypeId);
|
||||
wrapper.write(Types.UNSIGNED_BYTE, windowTypeId); // Window type id
|
||||
|
||||
final JsonElement titleComponent = wrapper.read(Types.COMPONENT); // Title
|
||||
String title = ChatUtil.jsonToLegacy(wrapper.user(), titleComponent);
|
||||
title = ChatUtil.removeUnusedColor(title, '8');
|
||||
if (title.length() > 32) {
|
||||
title = title.substring(0, 32);
|
||||
}
|
||||
wrapper.write(Types.STRING, title); // Window title
|
||||
|
||||
wrapper.passthrough(Types.UNSIGNED_BYTE); // Slots
|
||||
wrapper.write(Types.BOOLEAN, true); // Use provided window title
|
||||
|
||||
if (windowTypeId == 11) { // Horse
|
||||
wrapper.passthrough(Types.INT); // Entity id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CONTAINER_CLOSE, wrapper -> {
|
||||
final short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE); // Window id
|
||||
|
||||
wrapper.user().get(InventoryTracker.class).remove(windowId);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CONTAINER_SET_SLOT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.UNSIGNED_BYTE); // Window id
|
||||
map(Types.SHORT); // Slot
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Types.UNSIGNED_BYTE, 0));
|
||||
final short slot = wrapper.get(Types.SHORT, 0);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
if (slot == 1) {
|
||||
wrapper.cancel();
|
||||
} else if (slot >= 2) {
|
||||
wrapper.set(Types.SHORT, 0, (short) (slot - 1));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
map(Types.ITEM1_8, RewindTypes.COMPRESSED_NBT_ITEM); // item
|
||||
handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM, 0)));
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
|
||||
if (windowId != 0) {
|
||||
return;
|
||||
}
|
||||
final short slot = wrapper.get(Types.SHORT, 0);
|
||||
if (slot < 5 || slot > 8) {
|
||||
return;
|
||||
}
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
final Item item = wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM, 0);
|
||||
playerSession.setPlayerEquipment(wrapper.user().getProtocolInfo().getUuid(), item, 8 - slot);
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.isSpectator()) { // Spectator mode didn't exist in 1.7.10
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CONTAINER_SET_CONTENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.UNSIGNED_BYTE); // Window id
|
||||
|
||||
// remap enchantment table items
|
||||
handler(wrapper -> {
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Types.UNSIGNED_BYTE, 0));
|
||||
|
||||
Item[] items = wrapper.read(Types.ITEM1_8_SHORT_ARRAY);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
Item[] old = items;
|
||||
items = new Item[old.length - 1];
|
||||
items[0] = old[0];
|
||||
System.arraycopy(old, 2, items, 1, old.length - 3);
|
||||
}
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
items[i] = handleItemToClient(wrapper.user(), items[i]);
|
||||
}
|
||||
wrapper.write(RewindTypes.COMPRESSED_NBT_ITEM_ARRAY, items); // Items
|
||||
});
|
||||
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
|
||||
if (windowId != 0) {
|
||||
return;
|
||||
}
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
final UUID userId = wrapper.user().getProtocolInfo().getUuid();
|
||||
|
||||
final Item[] items = wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM_ARRAY, 0);
|
||||
for (int i = 5; i < 9; i++) {
|
||||
wrapper.user().get(PlayerSessionStorage.class).setPlayerEquipment(userId, items[i], 8 - i);
|
||||
if (tracker.isSpectator()) {
|
||||
items[i] = null;
|
||||
}
|
||||
}
|
||||
if (tracker.isSpectator()) {
|
||||
final GameProfileStorage.GameProfile profile = wrapper.user().get(GameProfileStorage.class).get(userId);
|
||||
if (profile != null) {
|
||||
items[5] = profile.getSkull();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CONTAINER_SET_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.UNSIGNED_BYTE); // Window id
|
||||
map(Types.SHORT); // Progress bar id
|
||||
map(Types.SHORT); // Progress bar value
|
||||
|
||||
handler(wrapper -> {
|
||||
final InventoryTracker windowTracker = wrapper.user().get(InventoryTracker.class);
|
||||
|
||||
final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
|
||||
final short windowType = windowTracker.get(windowId);
|
||||
|
||||
final short progressBarId = wrapper.get(Types.SHORT, 0);
|
||||
short progress = wrapper.get(Types.SHORT, 1);
|
||||
|
||||
if (windowType == 2) { // Furnace
|
||||
// TODO | Proper methods (getOrCreate)=
|
||||
final InventoryTracker.FurnaceData furnace = windowTracker.getFurnaceData().computeIfAbsent(windowId, x -> new InventoryTracker.FurnaceData());
|
||||
if (progressBarId == 0 || progressBarId == 1) {
|
||||
if (progressBarId == 0) {
|
||||
furnace.fuelLeft = progress;
|
||||
} else {
|
||||
furnace.maxFuel = progress;
|
||||
}
|
||||
if (furnace.maxFuel == 0) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
progress = (short) (200 * furnace.fuelLeft / furnace.maxFuel);
|
||||
wrapper.set(Types.SHORT, 0, (short) 1);
|
||||
wrapper.set(Types.SHORT, 1, progress);
|
||||
} else if (progressBarId == 2 || progressBarId == 3) {
|
||||
if (progressBarId == 2) {
|
||||
furnace.progress = progress;
|
||||
} else {
|
||||
furnace.maxProgress = progress;
|
||||
}
|
||||
if (furnace.maxProgress == 0) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
progress = (short) (200 * furnace.progress / furnace.maxProgress);
|
||||
wrapper.set(Types.SHORT, 0, (short) 0);
|
||||
wrapper.set(Types.SHORT, 1, progress);
|
||||
}
|
||||
} else if (windowType == 4 && progressBarId > 2) { // Enchanting Table
|
||||
wrapper.cancel();
|
||||
} else if (windowType == 8) { // Anvil
|
||||
windowTracker.levelCost = progress;
|
||||
windowTracker.anvilId = windowId;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CONTAINER_CLOSE, wrapper -> {
|
||||
final short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE);
|
||||
|
||||
wrapper.user().get(InventoryTracker.class).remove(windowId);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CONTAINER_CLICK, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BYTE, Types.UNSIGNED_BYTE); // Window id
|
||||
map(Types.SHORT); // Slot
|
||||
handler(wrapper -> {
|
||||
final short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0); // Window id
|
||||
final short slot = wrapper.get(Types.SHORT, 0);
|
||||
|
||||
final short windowType = wrapper.user().get(InventoryTracker.class).get(windowId);
|
||||
if (windowType == 4) { // Enchantment Table
|
||||
if (slot > 0) {
|
||||
wrapper.set(Types.SHORT, 0, (short) (slot + 1));
|
||||
}
|
||||
}
|
||||
});
|
||||
map(Types.BYTE); // Button
|
||||
map(Types.SHORT); // Action number
|
||||
map(Types.BYTE); // Mode
|
||||
map(RewindTypes.COMPRESSED_NBT_ITEM, Types.ITEM1_8); // Clicked item
|
||||
|
||||
handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.SET_CREATIVE_MODE_SLOT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.SHORT); // Slot
|
||||
map(RewindTypes.COMPRESSED_NBT_ITEM, Types.ITEM1_8); // Item
|
||||
|
||||
handler(wrapper -> handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerRewrites() {
|
||||
enchantmentRewriter = new LegacyEnchantmentRewriter(nbtTagName(), false);
|
||||
enchantmentRewriter.registerEnchantment(8, "§7Depth Strider");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToClient(UserConnection connection, Item item) {
|
||||
if (item == null) return null;
|
||||
super.handleItemToClient(connection, item);
|
||||
|
||||
CompoundTag tag = item.tag();
|
||||
if (tag == null) {
|
||||
item.setTag(tag = new CompoundTag());
|
||||
}
|
||||
enchantmentRewriter.handleToClient(item);
|
||||
|
||||
if (item.identifier() == 387) {
|
||||
final ListTag<StringTag> pages = tag.getListTag("pages", StringTag.class);
|
||||
if (pages == null) return item;
|
||||
|
||||
final ListTag<StringTag> oldPages = new ListTag<>(StringTag.class);
|
||||
tag.put(nbtTagName() + "|pages", oldPages);
|
||||
|
||||
for (StringTag page : pages) {
|
||||
final String value = page.getValue();
|
||||
oldPages.add(new StringTag(value));
|
||||
page.setValue(ChatUtil.jsonToLegacy(connection, value));
|
||||
}
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item handleItemToServer(UserConnection connection, Item item) {
|
||||
if (item == null) return null;
|
||||
super.handleItemToServer(connection, item);
|
||||
|
||||
final CompoundTag tag = item.tag();
|
||||
if (tag == null) return item;
|
||||
|
||||
enchantmentRewriter.handleToServer(item);
|
||||
|
||||
if (item.identifier() == 387) {
|
||||
final ListTag<StringTag> oldPages = tag.getListTag(nbtTagName() + "|pages", StringTag.class);
|
||||
if (oldPages != null) {
|
||||
tag.remove("pages");
|
||||
tag.put("pages", oldPages);
|
||||
}
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
}
|
||||
+701
@@ -0,0 +1,701 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.primitives.Ints;
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.api.rewriter.VREntityRewriter;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
|
||||
import com.viaversion.viarewind.api.type.version.Types1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.EntityDataIndex1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.VirtualHologramEntity;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.GameProfileStorage;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.ScoreboardTracker;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockPosition;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
|
||||
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.api.type.types.version.Types1_8;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEvent;
|
||||
import com.viaversion.viaversion.util.IdAndData;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets1_8, Protocol1_8To1_7_6_10> {
|
||||
|
||||
public EntityPacketRewriter1_8(Protocol1_8To1_7_6_10 protocol) {
|
||||
super(protocol, EntityDataTypes1_7_6_10.STRING, EntityDataTypes1_7_6_10.BYTE);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerPackets() {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.LOGIN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT); // Entity id
|
||||
map(Types.UNSIGNED_BYTE); // Game mode
|
||||
map(Types.BYTE); // Dimension
|
||||
map(Types.UNSIGNED_BYTE); // Difficulty
|
||||
map(Types.UNSIGNED_BYTE); // Max players
|
||||
map(Types.STRING); // Level type
|
||||
read(Types.BOOLEAN); // Reduced debug info
|
||||
|
||||
handler(playerTrackerHandler());
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Types.INT, 0);
|
||||
|
||||
if (ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
if (wrapper.get(Types.UNSIGNED_BYTE, 0) == 2) { // adventure
|
||||
wrapper.set(Types.UNSIGNED_BYTE, 0, (short) 0); // survival
|
||||
}
|
||||
}
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
tracker.addPlayer(entityId, wrapper.user().getProtocolInfo().getUuid());
|
||||
tracker.setClientEntityGameMode(wrapper.get(Types.UNSIGNED_BYTE, 0));
|
||||
|
||||
wrapper.user().get(ClientWorld.class).setEnvironment(wrapper.get(Types.BYTE, 0));
|
||||
|
||||
// Reset on Velocity server change
|
||||
wrapper.user().put(new ScoreboardTracker(wrapper.user()));
|
||||
});
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.REMOVE_ENTITIES, wrapper -> {
|
||||
final int[] entities = wrapper.read(Types.VAR_INT_ARRAY_PRIMITIVE);
|
||||
untrackEntities(wrapper.user(), entities);
|
||||
|
||||
wrapper.cancel();
|
||||
|
||||
// Split entity destroy packets into smaller packets because 1.8 can handle more entities at once then 1.7 can.
|
||||
final List<List<Integer>> parts = Lists.partition(Ints.asList(entities), Byte.MAX_VALUE);
|
||||
|
||||
for (List<Integer> part : parts) {
|
||||
final PacketWrapper destroy = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, wrapper.user());
|
||||
destroy.write(RewindTypes.INT_ARRAY, part.stream().mapToInt(Integer::intValue).toArray());
|
||||
destroy.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_ENTITY_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types1_8.ENTITY_DATA_LIST, Types1_7_6_10.ENTITY_DATA_LIST); // Entity data
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = tracker(wrapper.user());
|
||||
final int entityId = wrapper.get(Types.INT, 0);
|
||||
final List<EntityData> entityData = wrapper.get(Types1_7_6_10.ENTITY_DATA_LIST, 0);
|
||||
if (tracker.getHolograms().containsKey(entityId)) {
|
||||
wrapper.cancel();
|
||||
tracker.getHolograms().get(entityId).syncState(EntityPacketRewriter1_8.this, entityData);
|
||||
} else {
|
||||
handleEntityData(entityId, entityData, wrapper.user());
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ADD_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
map(Types.BYTE); // Type id
|
||||
map(Types.INT); // X
|
||||
map(Types.INT); // Y
|
||||
map(Types.INT); // Z
|
||||
map(Types.BYTE); // Pitch
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.INT); // Data
|
||||
|
||||
// Track entity
|
||||
handler(getObjectTrackerHandler());
|
||||
handler(getObjectRewriter(EntityTypes1_8.ObjectType::findById));
|
||||
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Types.VAR_INT, 0);
|
||||
final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(wrapper.get(Types.BYTE, 0), true);
|
||||
|
||||
int x = wrapper.get(Types.INT, 0);
|
||||
int y = wrapper.get(Types.INT, 1);
|
||||
int z = wrapper.get(Types.INT, 2);
|
||||
|
||||
byte pitch = wrapper.get(Types.BYTE, 1);
|
||||
byte yaw = wrapper.get(Types.BYTE, 2);
|
||||
|
||||
int data = wrapper.get(Types.INT, 3);
|
||||
|
||||
if (type == EntityTypes1_8.ObjectType.ITEM_FRAME.getType()) {
|
||||
yaw = switch (yaw) {
|
||||
case -128 -> {
|
||||
z += 32;
|
||||
yield 0;
|
||||
}
|
||||
case -64 -> {
|
||||
x -= 32;
|
||||
yield -64;
|
||||
}
|
||||
case 0 -> {
|
||||
z -= 32;
|
||||
yield -128;
|
||||
}
|
||||
case 64 -> {
|
||||
x += 32;
|
||||
yield 64;
|
||||
}
|
||||
default -> yaw;
|
||||
};
|
||||
} else if (type == EntityTypes1_8.ObjectType.ARMOR_STAND.getType()) {
|
||||
wrapper.cancel();
|
||||
|
||||
final EntityTracker1_8 tracker = tracker(wrapper.user());
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(entityId);
|
||||
hologram.setPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
|
||||
hologram.setHeadYaw(yaw * 360f / 256);
|
||||
} else if (type != null && type.isOrHasParent(EntityTypes1_8.EntityType.FALLING_BLOCK)) {
|
||||
int blockId = data & 0xFFF;
|
||||
int blockData = data >> 12 & 0xF;
|
||||
final IdAndData replace = protocol.getItemRewriter().handleBlock(blockId, blockData);
|
||||
if (replace != null) {
|
||||
blockId = replace.getId();
|
||||
blockData = replace.getData();
|
||||
}
|
||||
wrapper.set(Types.INT, 3, data = (blockId | blockData << 16));
|
||||
}
|
||||
|
||||
wrapper.set(Types.INT, 0, x);
|
||||
wrapper.set(Types.INT, 1, y);
|
||||
wrapper.set(Types.INT, 2, z);
|
||||
wrapper.set(Types.BYTE, 2, yaw);
|
||||
|
||||
if (data > 0) {
|
||||
wrapper.passthrough(Types.SHORT); // Velocity x
|
||||
wrapper.passthrough(Types.SHORT); // Velocity y
|
||||
wrapper.passthrough(Types.SHORT); // Velocity z
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
registerTracker(ClientboundPackets1_8.ADD_EXPERIENCE_ORB, EntityType.EXPERIENCE_ORB);
|
||||
registerTracker(ClientboundPackets1_8.ADD_GLOBAL_ENTITY, EntityType.LIGHTNING_BOLT);
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ADD_PAINTING, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
map(Types.STRING); // Title
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.INT_POSITION); // Position
|
||||
map(Types.UNSIGNED_BYTE, Types.INT); // Rotation
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Types.VAR_INT, 0);
|
||||
final BlockPosition position = wrapper.get(RewindTypes.INT_POSITION, 0);
|
||||
final int rotation = wrapper.get(Types.INT, 0);
|
||||
int modX = 0;
|
||||
int modZ = 0;
|
||||
switch (rotation) {
|
||||
case 0:
|
||||
modZ = -1;
|
||||
break;
|
||||
case 1:
|
||||
modX = 1;
|
||||
break;
|
||||
case 2:
|
||||
modZ = 1;
|
||||
break;
|
||||
case 3:
|
||||
modX = -1;
|
||||
break;
|
||||
}
|
||||
wrapper.set(RewindTypes.INT_POSITION, 0, new BlockPosition(position.x() + modX, position.y(), position.z() + modZ));
|
||||
addTrackedEntity(wrapper, entityId, EntityTypes1_8.EntityType.PAINTING);
|
||||
});
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ADD_MOB, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
map(Types.UNSIGNED_BYTE); // Entity type
|
||||
map(Types.INT); // X
|
||||
map(Types.INT); // Y
|
||||
map(Types.INT); // Z
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
map(Types.BYTE); // Head yaw
|
||||
map(Types.SHORT); // Velocity x
|
||||
map(Types.SHORT); // Velocity y
|
||||
map(Types.SHORT); // Velocity z
|
||||
map(Types1_8.ENTITY_DATA_LIST, Types1_7_6_10.ENTITY_DATA_LIST); // Entity data
|
||||
|
||||
handler(getTrackerHandler(Types.UNSIGNED_BYTE, 0));
|
||||
|
||||
// Handle holograms
|
||||
handler(wrapper -> {
|
||||
final short typeId = wrapper.get(Types.UNSIGNED_BYTE, 0);
|
||||
|
||||
final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(typeId, false);
|
||||
if (type == EntityTypes1_8.EntityType.ARMOR_STAND) {
|
||||
wrapper.cancel();
|
||||
final int entityId = wrapper.get(Types.VAR_INT, 0);
|
||||
|
||||
final int x = wrapper.get(Types.INT, 0);
|
||||
final int y = wrapper.get(Types.INT, 1);
|
||||
final int z = wrapper.get(Types.INT, 2);
|
||||
|
||||
final byte pitch = wrapper.get(Types.BYTE, 1);
|
||||
final byte yaw = wrapper.get(Types.BYTE, 0);
|
||||
final byte headYaw = wrapper.get(Types.BYTE, 2);
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(entityId);
|
||||
|
||||
hologram.setPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
|
||||
hologram.setHeadYaw(headYaw * 360f / 256);
|
||||
hologram.syncState(protocol().getEntityRewriter(), wrapper.get(Types1_7_6_10.ENTITY_DATA_LIST, 0));
|
||||
}
|
||||
});
|
||||
handler(getMobSpawnRewriter(Types1_7_6_10.ENTITY_DATA_LIST));
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ADD_PLAYER, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
handler(wrapper -> {
|
||||
final UUID uuid = wrapper.read(Types.UUID);
|
||||
wrapper.write(Types.STRING, uuid.toString());
|
||||
|
||||
final GameProfileStorage gameProfileStorage = wrapper.user().get(GameProfileStorage.class);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) {
|
||||
wrapper.write(Types.STRING, ""); // Name
|
||||
wrapper.write(Types.VAR_INT, 0); // Properties count
|
||||
} else {
|
||||
wrapper.write(Types.STRING, gameProfile.name.length() > 16 ? gameProfile.name.substring(0, 16) : gameProfile.name); // Name
|
||||
wrapper.write(Types.VAR_INT, gameProfile.properties.size()); // Properties count
|
||||
|
||||
for (GameProfileStorage.Property property : gameProfile.properties) {
|
||||
wrapper.write(Types.STRING, property.name); // Property name
|
||||
wrapper.write(Types.STRING, property.value); // Property value
|
||||
wrapper.write(Types.STRING, property.signature == null ? "" : property.signature); // Property signature
|
||||
}
|
||||
}
|
||||
|
||||
final int entityId = wrapper.get(Types.VAR_INT, 0);
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (gameProfile != null && gameProfile.gamemode == 3) { // Spectator mode
|
||||
for (short i = 0; i < 5; i++) {
|
||||
final PacketWrapper entityEquipment = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_EQUIPPED_ITEM, wrapper.user());
|
||||
entityEquipment.write(Types.INT, entityId);
|
||||
entityEquipment.write(Types.SHORT, i);
|
||||
entityEquipment.write(RewindTypes.COMPRESSED_NBT_ITEM, i == 4 ? gameProfile.getSkull() : null);
|
||||
|
||||
entityEquipment.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
|
||||
tracker.addPlayer(entityId, uuid);
|
||||
});
|
||||
map(Types.INT); // X
|
||||
map(Types.INT); // Y
|
||||
map(Types.INT); // Z
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
map(Types.SHORT); // Current item
|
||||
map(Types1_8.ENTITY_DATA_LIST, Types1_7_6_10.ENTITY_DATA_LIST); // Entity data
|
||||
|
||||
handler(getTrackerAndMetaHandler(Types1_7_6_10.ENTITY_DATA_LIST, EntityTypes1_8.EntityType.PLAYER));
|
||||
}
|
||||
});
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_EQUIPPED_ITEM, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.SHORT); // Slot
|
||||
map(Types.ITEM1_8, RewindTypes.COMPRESSED_NBT_ITEM); // Item
|
||||
|
||||
handler(wrapper -> protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM, 0)));
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
final int id = wrapper.get(Types.INT, 0);
|
||||
|
||||
final int limit = tracker.clientEntityId() == id ? 3 : 4;
|
||||
if (wrapper.get(Types.SHORT, 0) > limit) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
final short slot = wrapper.get(Types.SHORT, 0);
|
||||
final UUID uuid = tracker.getPlayerUUID(wrapper.get(Types.INT, 0));
|
||||
if (uuid == null) {
|
||||
return;
|
||||
}
|
||||
final Item item = wrapper.get(RewindTypes.COMPRESSED_NBT_ITEM, 0);
|
||||
wrapper.user().get(PlayerSessionStorage.class).setPlayerEquipment(uuid, item, slot);
|
||||
|
||||
final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
|
||||
GameProfileStorage.GameProfile profile = storage.get(uuid);
|
||||
if (profile != null && profile.gamemode == 3) { // spectator mode didn't exist in 1.7.10
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_SLEEP, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.U_BYTE_POSITION); // Position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.TAKE_ITEM_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Collected Entity id
|
||||
map(Types.VAR_INT, Types.INT); // Collector Entity id
|
||||
|
||||
handler(wrapper -> wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class).removeEntity(wrapper.get(Types.INT, 0)));
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_ENTITY_MOTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MOVE_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MOVE_ENTITY_POS, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // X
|
||||
map(Types.BYTE); // Y
|
||||
map(Types.BYTE); // Z
|
||||
read(Types.BOOLEAN); // On ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(wrapper.get(Types.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Types.BYTE, 0);
|
||||
final int y = wrapper.get(Types.BYTE, 1);
|
||||
final int z = wrapper.get(Types.BYTE, 2);
|
||||
|
||||
hologram.setRelativePosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MOVE_ENTITY_ROT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
read(Types.BOOLEAN); // On ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(wrapper.get(Types.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int yaw = wrapper.get(Types.BYTE, 0);
|
||||
final int pitch = wrapper.get(Types.BYTE, 1);
|
||||
|
||||
hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MOVE_ENTITY_POS_ROT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // X
|
||||
map(Types.BYTE); // Y
|
||||
map(Types.BYTE); // Z
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
read(Types.BOOLEAN); // On ground
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(wrapper.get(Types.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Types.BYTE, 0);
|
||||
final int y = wrapper.get(Types.BYTE, 1);
|
||||
final int z = wrapper.get(Types.BYTE, 2);
|
||||
|
||||
final int yaw = wrapper.get(Types.BYTE, 3);
|
||||
final int pitch = wrapper.get(Types.BYTE, 4);
|
||||
|
||||
hologram.setRelativePosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.TELEPORT_ENTITY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.INT); // X
|
||||
map(Types.INT); // Y
|
||||
map(Types.INT); // Z
|
||||
map(Types.BYTE); // Yaw
|
||||
map(Types.BYTE); // Pitch
|
||||
read(Types.BOOLEAN); // On ground
|
||||
handler(wrapper -> {
|
||||
final int entityId = wrapper.get(Types.INT, 0);
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.entityType(entityId) == EntityTypes1_8.EntityType.ABSTRACT_MINECART) { // TODO | Realign all entities?
|
||||
int y = wrapper.get(Types.INT, 2);
|
||||
y += 12;
|
||||
wrapper.set(Types.INT, 2, y);
|
||||
}
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(entityId);
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int x = wrapper.get(Types.INT, 1);
|
||||
final int y = wrapper.get(Types.INT, 2);
|
||||
final int z = wrapper.get(Types.INT, 3);
|
||||
|
||||
final int yaw = wrapper.get(Types.BYTE, 0);
|
||||
final int pitch = wrapper.get(Types.BYTE, 1);
|
||||
|
||||
hologram.setPosition(x / 32.0, y / 32.0, z / 32.0);
|
||||
hologram.setRotation(yaw * 360f / 256, pitch * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.ROTATE_HEAD, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // Head yaw
|
||||
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
final VirtualHologramEntity hologram = tracker.getHolograms().get(wrapper.get(Types.INT, 0));
|
||||
if (hologram != null) {
|
||||
wrapper.cancel();
|
||||
final int yaw = wrapper.get(Types.BYTE, 0);
|
||||
|
||||
hologram.setHeadYaw(yaw * 360f / 256);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_ENTITY_LINK, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT); // Riding Entity id
|
||||
map(Types.INT); // Vehicle Entity id
|
||||
map(Types.BOOLEAN); // Leash state
|
||||
handler(wrapper -> {
|
||||
final boolean leash = wrapper.get(Types.BOOLEAN, 0);
|
||||
if (!leash) {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
final int passenger = wrapper.get(Types.INT, 0);
|
||||
final int vehicle = wrapper.get(Types.INT, 1);
|
||||
|
||||
tracker.setPassenger(vehicle, passenger);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_MOB_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // Effect id
|
||||
map(Types.BYTE); // Amplifier
|
||||
map(Types.VAR_INT, Types.SHORT); // Duration
|
||||
read(Types.BYTE); // Hide particles
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.REMOVE_MOB_EFFECT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
map(Types.BYTE); // Effect id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_ATTRIBUTES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT, Types.INT); // Entity id
|
||||
handler(wrapper -> {
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.getHolograms().containsKey(wrapper.get(Types.INT, 0))) { // Don't handle properties for hologram emulation
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
final int amount = wrapper.passthrough(Types.INT);
|
||||
for (int i = 0; i < amount; i++) {
|
||||
wrapper.passthrough(Types.STRING); // id
|
||||
wrapper.passthrough(Types.DOUBLE); // value
|
||||
|
||||
int modifierLength = wrapper.read(Types.VAR_INT);
|
||||
wrapper.write(Types.SHORT, (short) modifierLength);
|
||||
for (int j = 0; j < modifierLength; j++) {
|
||||
wrapper.passthrough(Types.UUID); // modifier uuid
|
||||
wrapper.passthrough(Types.DOUBLE); // modifier amount
|
||||
wrapper.passthrough(Types.BYTE); // modifier operation
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.UPDATE_ENTITY_NBT);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerRewrites() {
|
||||
// Handle new entities
|
||||
mapEntityTypeWithData(EntityType.GUARDIAN, EntityType.SQUID).plainName();
|
||||
mapEntityTypeWithData(EntityType.ENDERMITE, EntityType.SQUID).plainName();
|
||||
mapEntityTypeWithData(EntityType.RABBIT, EntityType.CHICKEN).plainName();
|
||||
|
||||
// Entity data rewrite
|
||||
filter().handler(this::handleEntityData);
|
||||
}
|
||||
|
||||
public void handleEntityData(EntityDataHandlerEvent event, EntityData entityData) {
|
||||
final EntityDataIndex1_7_6_10 metaIndex = EntityDataIndex1_7_6_10.searchIndex(event.entityType(), entityData.id());
|
||||
if (metaIndex == null) {
|
||||
// Almost certainly bad data, remove it
|
||||
event.cancel();
|
||||
return;
|
||||
}
|
||||
if (metaIndex.getOldType() == null) {
|
||||
event.cancel();
|
||||
return;
|
||||
}
|
||||
final Object value = entityData.getValue();
|
||||
entityData.setTypeAndValue(metaIndex.getNewType(), value);
|
||||
entityData.setDataTypeUnsafe(metaIndex.getOldType());
|
||||
entityData.setId(metaIndex.getIndex());
|
||||
|
||||
switch (metaIndex.getOldType()) {
|
||||
case INT:
|
||||
if (metaIndex.getNewType() == EntityDataTypes1_8.BYTE) {
|
||||
entityData.setValue(((Byte) value).intValue());
|
||||
if (metaIndex == EntityDataIndex1_7_6_10.ABSTRACT_AGEABLE_AGE) {
|
||||
if ((Integer) entityData.getValue() < 0) {
|
||||
entityData.setValue(-25000);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (metaIndex.getNewType() == EntityDataTypes1_8.SHORT) {
|
||||
entityData.setValue(((Short) value).intValue());
|
||||
}
|
||||
if (metaIndex.getNewType() == EntityDataTypes1_8.INT) {
|
||||
entityData.setValue(value);
|
||||
}
|
||||
break;
|
||||
case BYTE:
|
||||
if (metaIndex.getNewType() == EntityDataTypes1_8.INT) {
|
||||
entityData.setValue(((Integer) value).byteValue());
|
||||
}
|
||||
if (metaIndex.getNewType() == EntityDataTypes1_8.BYTE) {
|
||||
if (metaIndex == EntityDataIndex1_7_6_10.ITEM_FRAME_ROTATION) {
|
||||
entityData.setValue(Integer.valueOf((Byte) value % 4).byteValue());
|
||||
} else {
|
||||
entityData.setValue(value);
|
||||
}
|
||||
}
|
||||
if (metaIndex == EntityDataIndex1_7_6_10.PLAYER_SKIN_FLAGS) {
|
||||
byte flags = (byte) value;
|
||||
boolean cape = (flags & 0x01) != 0;
|
||||
flags = (byte) (cape ? 0x00 : 0x02);
|
||||
entityData.setValue(flags);
|
||||
}
|
||||
break;
|
||||
case ITEM:
|
||||
entityData.setValue(protocol.getItemRewriter().handleItemToClient(event.user(), (Item) value));
|
||||
break;
|
||||
case FLOAT:
|
||||
case STRING:
|
||||
case SHORT:
|
||||
case POSITION:
|
||||
entityData.setValue(value);
|
||||
break;
|
||||
default:
|
||||
event.cancel();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityTypes1_8.EntityType typeFromId(int type) {
|
||||
return EntityTypes1_8.getTypeFromId(type, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityTypes1_8.EntityType objectTypeFromId(int type) {
|
||||
return EntityTypes1_8.getTypeFromId(type, true);
|
||||
}
|
||||
}
|
||||
+782
@@ -0,0 +1,782 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.TitleRenderProvider;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.*;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viarewind.api.minecraft.math.AABB;
|
||||
import com.viaversion.viarewind.api.minecraft.math.Ray3d;
|
||||
import com.viaversion.viarewind.api.minecraft.math.RayTracing;
|
||||
import com.viaversion.viarewind.api.minecraft.math.Vector3d;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockPosition;
|
||||
import com.viaversion.viaversion.api.minecraft.Environment;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.libs.gson.JsonElement;
|
||||
import com.viaversion.nbt.tag.CompoundTag;
|
||||
import com.viaversion.nbt.tag.ListTag;
|
||||
import com.viaversion.nbt.tag.StringTag;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
|
||||
import com.viaversion.viaversion.util.ComponentUtil;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerPacketRewriter1_8 {
|
||||
|
||||
public static void register(Protocol1_8To1_7_6_10 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CHAT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.COMPONENT); // Chat message
|
||||
handler(wrapper -> {
|
||||
final int position = wrapper.read(Types.BYTE);
|
||||
if (position == 2) { // Above hotbar
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_DEFAULT_SPAWN_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.INT_POSITION); // Spawn position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_HEALTH, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.FLOAT); // Health
|
||||
map(Types.VAR_INT, Types.SHORT); // Food
|
||||
map(Types.FLOAT); // Food saturation
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.RESPAWN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT); // Dimension
|
||||
map(Types.UNSIGNED_BYTE); // Difficulty
|
||||
map(Types.UNSIGNED_BYTE); // Game mode
|
||||
handler(wrapper -> {
|
||||
if (ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
if (wrapper.get(Types.UNSIGNED_BYTE, 1) == 2) {
|
||||
wrapper.set(Types.UNSIGNED_BYTE, 1, (short) 0);
|
||||
}
|
||||
}
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
tracker.setClientEntityGameMode(wrapper.get(Types.UNSIGNED_BYTE, 1));
|
||||
|
||||
final Environment dimension = Environment.getEnvironmentById(wrapper.get(Types.INT, 0));
|
||||
|
||||
// Clear entities on dimension change and re-track player
|
||||
final ClientWorld world = wrapper.user().get(ClientWorld.class);
|
||||
if (world.getEnvironment() != dimension) {
|
||||
world.setEnvironment(dimension.id());
|
||||
tracker.clearEntities();
|
||||
tracker.addEntity(tracker.clientEntityId(), EntityTypes1_8.EntityType.PLAYER);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_POSITION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.DOUBLE); // X
|
||||
map(Types.DOUBLE); // Y
|
||||
map(Types.DOUBLE); // Z
|
||||
map(Types.FLOAT); // Yaw
|
||||
map(Types.FLOAT); // Pitch
|
||||
handler(wrapper -> {
|
||||
final double x = wrapper.get(Types.DOUBLE, 0);
|
||||
double y = wrapper.get(Types.DOUBLE, 1);
|
||||
final double z = wrapper.get(Types.DOUBLE, 2);
|
||||
|
||||
final float yaw = wrapper.get(Types.FLOAT, 0);
|
||||
final float pitch = wrapper.get(Types.FLOAT, 1);
|
||||
|
||||
final PlayerSessionStorage playerSession = wrapper.user().get(PlayerSessionStorage.class);
|
||||
final int flags = wrapper.read(Types.BYTE);
|
||||
|
||||
// x, y, and z
|
||||
if ((flags & 0x01) == 0x01) wrapper.set(Types.DOUBLE, 0, x + playerSession.getPosX());
|
||||
if ((flags & 0x02) == 0x02) y += playerSession.getPosY();
|
||||
|
||||
playerSession.receivedPosY = y;
|
||||
wrapper.set(Types.DOUBLE, 1, y + 1.62F);
|
||||
|
||||
if ((flags & 0x04) == 0x04) wrapper.set(Types.DOUBLE, 2, z + playerSession.getPosZ());
|
||||
|
||||
// yaw and pitch
|
||||
if ((flags & 0x08) == 0x08) wrapper.set(Types.FLOAT, 0, yaw + playerSession.yaw);
|
||||
if ((flags & 0x10) == 0x10) wrapper.set(Types.FLOAT, 1, pitch + playerSession.pitch);
|
||||
|
||||
wrapper.write(Types.BOOLEAN, playerSession.onGround);
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.spectatingClientEntityId != tracker.clientEntityId()) {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_EXPERIENCE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.FLOAT); // Experience bar
|
||||
map(Types.VAR_INT, Types.SHORT); // Level
|
||||
map(Types.VAR_INT, Types.SHORT); // Total experience
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.GAME_EVENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.UNSIGNED_BYTE); // Reason
|
||||
map(Types.FLOAT); // Value
|
||||
handler(wrapper -> {
|
||||
if (wrapper.get(Types.UNSIGNED_BYTE, 0) != 3) return; // Change game mode
|
||||
int gameMode = wrapper.get(Types.FLOAT, 0).intValue();
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (gameMode == 3 || tracker.isSpectator()) {
|
||||
UUID myId = wrapper.user().getProtocolInfo().getUuid();
|
||||
Item[] equipment = new Item[4];
|
||||
if (gameMode == 3) {
|
||||
GameProfileStorage.GameProfile profile = wrapper.user().get(GameProfileStorage.class).get(myId);
|
||||
equipment[3] = profile == null ? null : profile.getSkull();
|
||||
} else {
|
||||
for (int i = 0; i < equipment.length; i++) {
|
||||
equipment[i] = wrapper.user().get(PlayerSessionStorage.class).getPlayerEquipment(myId, i);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < equipment.length; i++) {
|
||||
PacketWrapper setSlot = PacketWrapper.create(ClientboundPackets1_7_2_5.CONTAINER_SET_SLOT, wrapper.user());
|
||||
setSlot.write(Types.BYTE, (byte) 0);
|
||||
setSlot.write(Types.SHORT, (short) (8 - i));
|
||||
setSlot.write(RewindTypes.COMPRESSED_NBT_ITEM, equipment[i]);
|
||||
setSlot.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
|
||||
if (gameMode == 2 && ViaRewind.getConfig().isReplaceAdventureMode()) {
|
||||
gameMode = 0;
|
||||
wrapper.set(Types.FLOAT, 0, 0.0f);
|
||||
}
|
||||
tracker.setClientEntityGameMode(gameMode);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.OPEN_SIGN_EDITOR, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.INT_POSITION); // Position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_INFO, wrapper -> {
|
||||
wrapper.cancel();
|
||||
final GameProfileStorage gameProfileStorage = wrapper.user().get(GameProfileStorage.class);
|
||||
final int action = wrapper.read(Types.VAR_INT);
|
||||
final int count = wrapper.read(Types.VAR_INT);
|
||||
for (int i = 0; i < count; i++) {
|
||||
UUID uuid = wrapper.read(Types.UUID);
|
||||
if (action == 0) {
|
||||
String name = wrapper.read(Types.STRING);
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) gameProfile = gameProfileStorage.put(uuid, name);
|
||||
|
||||
int propertyCount = wrapper.read(Types.VAR_INT);
|
||||
while (propertyCount-- > 0) {
|
||||
String propertyName = wrapper.read(Types.STRING);
|
||||
String propertyValue = wrapper.read(Types.STRING);
|
||||
String propertySignature = wrapper.read(Types.OPTIONAL_STRING);
|
||||
gameProfile.properties.add(new GameProfileStorage.Property(propertyName, propertyValue, propertySignature));
|
||||
}
|
||||
|
||||
int gamemode = wrapper.read(Types.VAR_INT);
|
||||
int ping = wrapper.read(Types.VAR_INT);
|
||||
gameProfile.ping = ping;
|
||||
gameProfile.gamemode = gamemode;
|
||||
JsonElement displayName = wrapper.read(Types.OPTIONAL_COMPONENT);
|
||||
if (displayName != null) {
|
||||
gameProfile.setDisplayName(ChatUtil.jsonToLegacy(wrapper.user(), displayName));
|
||||
}
|
||||
|
||||
final PacketWrapper playerInfo = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
playerInfo.write(Types.STRING, gameProfile.getDisplayName());
|
||||
playerInfo.write(Types.BOOLEAN, true);
|
||||
playerInfo.write(Types.SHORT, (short) ping);
|
||||
playerInfo.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
} else if (action == 1) {
|
||||
final int gamemode = wrapper.read(Types.VAR_INT);
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null || gameProfile.gamemode == gamemode) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (gamemode == 3 || gameProfile.gamemode == 3) {
|
||||
EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
int entityId = tracker.getPlayerEntityId(uuid);
|
||||
boolean isOwnPlayer = entityId == tracker.clientEntityId();
|
||||
if (entityId != -1) {
|
||||
// Weirdly, PlayerEntity has only 4 slots instead of 5
|
||||
Item[] equipment = new Item[isOwnPlayer ? 4 : 5];
|
||||
if (gamemode == 3) {
|
||||
equipment[isOwnPlayer ? 3 : 4] = gameProfile.getSkull();
|
||||
} else {
|
||||
for (int j = 0; j < equipment.length; j++) {
|
||||
equipment[j] = wrapper.user().get(PlayerSessionStorage.class).getPlayerEquipment(uuid, j);
|
||||
}
|
||||
}
|
||||
|
||||
for (short slot = 0; slot < equipment.length; slot++) {
|
||||
final PacketWrapper setEquipment = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_EQUIPPED_ITEM, wrapper.user());
|
||||
setEquipment.write(Types.INT, entityId);
|
||||
setEquipment.write(Types.SHORT, slot);
|
||||
setEquipment.write(RewindTypes.COMPRESSED_NBT_ITEM, equipment[slot]);
|
||||
setEquipment.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gameProfile.gamemode = gamemode;
|
||||
} else if (action == 2) {
|
||||
final int ping = wrapper.read(Types.VAR_INT);
|
||||
|
||||
final GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null) {
|
||||
continue;
|
||||
}
|
||||
PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
packet.write(Types.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Types.BOOLEAN, false);
|
||||
packet.write(Types.SHORT, (short) gameProfile.ping);
|
||||
packet.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
gameProfile.ping = ping;
|
||||
|
||||
packet = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
packet.write(Types.STRING, gameProfile.getDisplayName());
|
||||
packet.write(Types.BOOLEAN, true);
|
||||
packet.write(Types.SHORT, (short) ping);
|
||||
packet.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
} else if (action == 3) {
|
||||
JsonElement displayNameComponent = wrapper.read(Types.OPTIONAL_COMPONENT);
|
||||
String displayName = displayNameComponent != null ? ChatUtil.jsonToLegacy(wrapper.user(), displayNameComponent) : null;
|
||||
|
||||
GameProfileStorage.GameProfile gameProfile = gameProfileStorage.get(uuid);
|
||||
if (gameProfile == null || gameProfile.displayName == null && displayName == null) continue;
|
||||
|
||||
PacketWrapper playerInfo = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
playerInfo.write(Types.STRING, gameProfile.getDisplayName());
|
||||
playerInfo.write(Types.BOOLEAN, false);
|
||||
playerInfo.write(Types.SHORT, (short) gameProfile.ping);
|
||||
playerInfo.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
if (gameProfile.displayName == null && displayName != null || gameProfile.displayName != null && displayName == null || !gameProfile.displayName.equals(displayName)) {
|
||||
gameProfile.setDisplayName(displayName);
|
||||
}
|
||||
|
||||
playerInfo = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
playerInfo.write(Types.STRING, gameProfile.getDisplayName());
|
||||
playerInfo.write(Types.BOOLEAN, true);
|
||||
playerInfo.write(Types.SHORT, (short) gameProfile.ping);
|
||||
playerInfo.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
} else if (action == 4) {
|
||||
final GameProfileStorage.GameProfile gameProfile = gameProfileStorage.remove(uuid);
|
||||
if (gameProfile == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
final PacketWrapper playerInfo = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_INFO, wrapper.user());
|
||||
playerInfo.write(Types.STRING, gameProfile.getDisplayName());
|
||||
playerInfo.write(Types.BOOLEAN, false);
|
||||
playerInfo.write(Types.SHORT, (short) gameProfile.ping);
|
||||
playerInfo.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.PLAYER_ABILITIES, wrapper -> {
|
||||
final byte flags = wrapper.passthrough(Types.BYTE);
|
||||
final float flySpeed = wrapper.passthrough(Types.FLOAT);
|
||||
final float walkSpeed = wrapper.passthrough(Types.FLOAT);
|
||||
|
||||
final PlayerSessionStorage abilities = wrapper.user().get(PlayerSessionStorage.class);
|
||||
abilities.invincible = (flags & 8) == 8;
|
||||
abilities.allowFly = (flags & 4) == 4;
|
||||
abilities.flying = (flags & 2) == 2;
|
||||
abilities.creative = (flags & 1) == 1;
|
||||
abilities.flySpeed = flySpeed;
|
||||
abilities.walkSpeed = walkSpeed;
|
||||
|
||||
if (abilities.sprinting && abilities.flying) {
|
||||
wrapper.set(Types.FLOAT, 0, abilities.flySpeed * 2.0f);
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CUSTOM_PAYLOAD, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING);
|
||||
handlerSoftFail(wrapper -> {
|
||||
wrapper.cancel();
|
||||
final String channel = wrapper.get(Types.STRING, 0);
|
||||
if (channel.equals("MC|TrList")) {
|
||||
wrapper.passthrough(Types.INT); // Window id
|
||||
|
||||
int size = wrapper.passthrough(Types.UNSIGNED_BYTE);
|
||||
for (int i = 0; i < size; i++) {
|
||||
Item item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_8));
|
||||
wrapper.write(RewindTypes.COMPRESSED_NBT_ITEM, item); // Buy item 1
|
||||
|
||||
item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_8));
|
||||
wrapper.write(RewindTypes.COMPRESSED_NBT_ITEM, item); // Buy item 3
|
||||
|
||||
boolean has3Items = wrapper.passthrough(Types.BOOLEAN);
|
||||
if (has3Items) {
|
||||
item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_8));
|
||||
wrapper.write(RewindTypes.COMPRESSED_NBT_ITEM, item); // Buy item 2
|
||||
}
|
||||
|
||||
wrapper.passthrough(Types.BOOLEAN); // Unavailable
|
||||
wrapper.read(Types.INT); // Uses
|
||||
wrapper.read(Types.INT); // Max uses
|
||||
}
|
||||
} else if (channel.equals("MC|Brand")) {
|
||||
wrapper.write(Types.REMAINING_BYTES, wrapper.read(Types.STRING).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
|
||||
wrapper.setPacketType(null);
|
||||
final ByteBuf data = Unpooled.buffer();
|
||||
wrapper.writeToBuffer(data);
|
||||
|
||||
// Write new packet to append length
|
||||
final PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_7_2_5.CUSTOM_PAYLOAD, data, wrapper.user());
|
||||
packet.passthrough(Types.STRING);
|
||||
if (data.readableBytes() <= Short.MAX_VALUE) {
|
||||
packet.write(Types.SHORT, (short) data.readableBytes());
|
||||
packet.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_CAMERA, null, wrapper -> {
|
||||
wrapper.cancel();
|
||||
final int entityId = wrapper.read(Types.VAR_INT);
|
||||
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.spectatingClientEntityId != entityId) {
|
||||
tracker.setSpectating(entityId);
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_TITLES, null, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(wrapper -> {
|
||||
wrapper.cancel();
|
||||
final int action = wrapper.read(Types.VAR_INT);
|
||||
final TitleRenderProvider provider = Via.getManager().getProviders().get(TitleRenderProvider.class);
|
||||
if (provider == null) {
|
||||
return;
|
||||
}
|
||||
final UUID uuid = wrapper.user().getProtocolInfo().getUuid();
|
||||
switch (action) {
|
||||
case 0:
|
||||
provider.setTitle(uuid, wrapper.read(Types.STRING));
|
||||
break;
|
||||
case 1:
|
||||
provider.setSubTitle(uuid, wrapper.read(Types.STRING));
|
||||
break;
|
||||
case 2:
|
||||
provider.setTimings(uuid, wrapper.read(Types.INT), wrapper.read(Types.INT), wrapper.read(Types.INT));
|
||||
break;
|
||||
case 3:
|
||||
provider.clear(uuid);
|
||||
break;
|
||||
case 4:
|
||||
provider.reset(uuid);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.TAB_LIST);
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.RESOURCE_PACK, ClientboundPackets1_7_2_5.CUSTOM_PAYLOAD, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
create(Types.STRING, "MC|RPack");
|
||||
handler(wrapper -> {
|
||||
final ByteBuf buf = ByteBufAllocator.DEFAULT.buffer();
|
||||
try {
|
||||
// Url
|
||||
Types.STRING.write(buf, wrapper.read(Types.STRING));
|
||||
wrapper.write(Types.SHORT_BYTE_ARRAY, Types.REMAINING_BYTES.read(buf));
|
||||
} finally {
|
||||
buf.release();
|
||||
}
|
||||
});
|
||||
read(Types.STRING); // Hash
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CHAT, wrapper -> {
|
||||
final String message = wrapper.passthrough(Types.STRING);
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.isSpectator() && message.toLowerCase().startsWith("/stp ")) { // TODO add setting
|
||||
String username = message.split(" ")[1];
|
||||
final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
|
||||
|
||||
final GameProfileStorage.GameProfile profile = storage.get(username, true);
|
||||
if (profile != null && profile.uuid != null) {
|
||||
wrapper.cancel();
|
||||
|
||||
final PacketWrapper teleport = PacketWrapper.create(ClientboundPackets1_7_2_5.TELEPORT_ENTITY, wrapper.user());
|
||||
teleport.write(Types.UUID, profile.uuid);
|
||||
teleport.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.INTERACT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT, Types.VAR_INT); // Entity id
|
||||
map(Types.BYTE, Types.VAR_INT); // Mode
|
||||
handler(wrapper -> {
|
||||
final int mode = wrapper.get(Types.VAR_INT, 1);
|
||||
if (mode != 0) {
|
||||
return;
|
||||
}
|
||||
final int entityId = wrapper.get(Types.VAR_INT, 0);
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
|
||||
|
||||
if (!tracker.getHolograms().containsKey(entityId)) {
|
||||
return;
|
||||
}
|
||||
final AABB boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
|
||||
|
||||
Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());
|
||||
double yaw = Math.toRadians(position.yaw);
|
||||
double pitch = Math.toRadians(position.pitch);
|
||||
|
||||
Vector3d dir = new Vector3d(-Math.cos(pitch) * Math.sin(yaw), -Math.sin(pitch), Math.cos(pitch) * Math.cos(yaw));
|
||||
Ray3d ray = new Ray3d(pos, dir);
|
||||
Vector3d intersection = RayTracing.trace(ray, boundingBox, 5.0);
|
||||
|
||||
if (intersection == null) {
|
||||
return;
|
||||
}
|
||||
intersection.substract(boundingBox.getMin());
|
||||
|
||||
wrapper.set(Types.VAR_INT, 1, 2);
|
||||
wrapper.write(Types.FLOAT, (float) intersection.getX());
|
||||
wrapper.write(Types.FLOAT, (float) intersection.getY());
|
||||
wrapper.write(Types.FLOAT, (float) intersection.getZ());
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.MOVE_PLAYER_STATUS_ONLY, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BOOLEAN); // On ground
|
||||
handler(wrapper -> wrapper.user().get(PlayerSessionStorage.class).onGround = wrapper.get(Types.BOOLEAN, 0));
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.MOVE_PLAYER_POS, wrapper -> {
|
||||
final double x = wrapper.passthrough(Types.DOUBLE);
|
||||
final double y = wrapper.passthrough(Types.DOUBLE);
|
||||
wrapper.read(Types.DOUBLE); // Head Y
|
||||
final double z = wrapper.passthrough(Types.DOUBLE);
|
||||
|
||||
final PlayerSessionStorage storage = wrapper.user().get(PlayerSessionStorage.class);
|
||||
storage.onGround = wrapper.passthrough(Types.BOOLEAN);
|
||||
storage.setPos(x, y, z);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.MOVE_PLAYER_ROT, wrapper -> {
|
||||
final PlayerSessionStorage storage = wrapper.user().get(PlayerSessionStorage.class);
|
||||
storage.yaw = wrapper.passthrough(Types.FLOAT);
|
||||
storage.pitch = wrapper.passthrough(Types.FLOAT);
|
||||
storage.onGround = wrapper.passthrough(Types.BOOLEAN);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.MOVE_PLAYER_POS_ROT, wrapper -> {
|
||||
final double x = wrapper.passthrough(Types.DOUBLE);
|
||||
final double y = wrapper.passthrough(Types.DOUBLE);
|
||||
wrapper.read(Types.DOUBLE); // Head Y
|
||||
final double z = wrapper.passthrough(Types.DOUBLE);
|
||||
|
||||
final PlayerSessionStorage storage = wrapper.user().get(PlayerSessionStorage.class);
|
||||
storage.setPos(x, y, z);
|
||||
storage.yaw = wrapper.passthrough(Types.FLOAT);
|
||||
storage.pitch = wrapper.passthrough(Types.FLOAT);
|
||||
storage.onGround = wrapper.passthrough(Types.BOOLEAN);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_ACTION, new PacketHandlers() {
|
||||
@Override
|
||||
protected void register() {
|
||||
map(Types.VAR_INT); // Status
|
||||
map(RewindTypes.U_BYTE_POSITION, Types.BLOCK_POSITION1_8); // Position
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.USE_ITEM_ON, new PacketHandlers() {
|
||||
@Override
|
||||
protected void register() {
|
||||
map(RewindTypes.U_BYTE_POSITION, Types.BLOCK_POSITION1_8); // Position
|
||||
map(Types.BYTE); // Direction
|
||||
map(RewindTypes.COMPRESSED_NBT_ITEM, Types.ITEM1_8); // Item
|
||||
|
||||
handler(wrapper -> protocol.getItemRewriter().handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.SWING, wrapper -> {
|
||||
final int entityId = wrapper.read(Types.INT);
|
||||
int animation = wrapper.read(Types.BYTE);
|
||||
if (animation == 1) {
|
||||
return;
|
||||
}
|
||||
wrapper.cancel();
|
||||
|
||||
// 1.7 is not sending this packet with animation!=1
|
||||
switch (animation) {
|
||||
case 104:
|
||||
animation = 0;
|
||||
break;
|
||||
case 105:
|
||||
animation = 1;
|
||||
break;
|
||||
case 3:
|
||||
animation = 2;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
final PacketWrapper animate = PacketWrapper.create(ClientboundPackets1_7_2_5.ANIMATE, wrapper.user());
|
||||
animate.write(Types.VAR_INT, entityId);
|
||||
animate.write(Types.VAR_INT, animation);
|
||||
animate.write(Types.VAR_INT, 0);
|
||||
animate.send(Protocol1_8To1_7_6_10.class);
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_COMMAND, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT, Types.VAR_INT); // Entity id
|
||||
handler(wrapper -> wrapper.write(Types.VAR_INT, wrapper.read(Types.BYTE) - 1)); // Action id
|
||||
map(Types.INT, Types.VAR_INT); // Action parameter
|
||||
handler(wrapper -> {
|
||||
final int action = wrapper.get(Types.VAR_INT, 1);
|
||||
if (action == 3 || action == 4) {
|
||||
final PlayerSessionStorage storage = wrapper.user().get(PlayerSessionStorage.class);
|
||||
storage.sprinting = action == 3;
|
||||
|
||||
final PacketWrapper abilities = PacketWrapper.create(ClientboundPackets1_7_2_5.PLAYER_ABILITIES, wrapper.user());
|
||||
abilities.write(Types.BYTE, storage.combineAbilities());
|
||||
abilities.write(Types.FLOAT, storage.sprinting ? storage.flySpeed * 2.0f : storage.flySpeed);
|
||||
abilities.write(Types.FLOAT, storage.walkSpeed);
|
||||
abilities.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_INPUT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.FLOAT); // Sideways
|
||||
map(Types.FLOAT); // Forwards
|
||||
handler(wrapper -> {
|
||||
final boolean jump = wrapper.read(Types.BOOLEAN);
|
||||
final boolean unmount = wrapper.read(Types.BOOLEAN);
|
||||
short flags = 0;
|
||||
if (jump) flags += 0x01;
|
||||
if (unmount) flags += 0x02;
|
||||
wrapper.write(Types.UNSIGNED_BYTE, flags);
|
||||
|
||||
if (!unmount) {
|
||||
return;
|
||||
}
|
||||
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
|
||||
if (tracker.spectatingClientEntityId != tracker.clientEntityId()) {
|
||||
PacketWrapper sneakPacket = PacketWrapper.create(ServerboundPackets1_8.PLAYER_COMMAND, wrapper.user());
|
||||
sneakPacket.write(Types.VAR_INT, tracker.clientEntityId());
|
||||
sneakPacket.write(Types.VAR_INT, 0); // Start sneaking
|
||||
sneakPacket.write(Types.VAR_INT, 0); // Action parameter
|
||||
|
||||
sneakPacket.scheduleSendToServer(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.SIGN_UPDATE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // Position
|
||||
handler(wrapper -> {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
final String line = wrapper.read(Types.STRING);
|
||||
wrapper.write(Types.COMPONENT, ComponentUtil.legacyToJson(line));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.PLAYER_ABILITIES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BYTE); // Flags
|
||||
map(Types.FLOAT); // Fly speed
|
||||
map(Types.FLOAT); // Walk speed
|
||||
handler(wrapper -> {
|
||||
final PlayerSessionStorage storage = wrapper.user().get(PlayerSessionStorage.class);
|
||||
if (storage.allowFly) {
|
||||
final byte flags = wrapper.get(Types.BYTE, 0);
|
||||
storage.flying = (flags & 2) == 2;
|
||||
}
|
||||
wrapper.set(Types.FLOAT, 0, storage.flySpeed);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.COMMAND_SUGGESTION, wrapper -> {
|
||||
final String message = wrapper.passthrough(Types.STRING);
|
||||
wrapper.write(Types.OPTIONAL_POSITION1_8, null);
|
||||
|
||||
if (message.toLowerCase().startsWith("/stp ")) {
|
||||
wrapper.cancel();
|
||||
final String[] args = message.split(" ");
|
||||
if (args.length <= 2) {
|
||||
final String prefix = args.length == 1 ? "" : args[1];
|
||||
final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
|
||||
final List<GameProfileStorage.GameProfile> profiles = storage.getAllWithPrefix(prefix, true);
|
||||
|
||||
final PacketWrapper commandSuggestions = PacketWrapper.create(ClientboundPackets1_7_2_5.COMMAND_SUGGESTIONS, wrapper.user());
|
||||
commandSuggestions.write(Types.VAR_INT, profiles.size());
|
||||
for (GameProfileStorage.GameProfile profile : profiles) {
|
||||
commandSuggestions.write(Types.STRING, profile.name);
|
||||
}
|
||||
commandSuggestions.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CLIENT_INFORMATION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING); // Locale
|
||||
map(Types.BYTE); // View distance
|
||||
map(Types.BYTE); // Chat flags
|
||||
map(Types.BOOLEAN); // Chat colours
|
||||
read(Types.BYTE); // Difficulty
|
||||
handler(wrapper -> {
|
||||
final boolean showCape = wrapper.read(Types.BOOLEAN);
|
||||
wrapper.write(Types.UNSIGNED_BYTE, (short) (showCape ? 127 : 126));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerServerbound(ServerboundPackets1_7_2_5.CUSTOM_PAYLOAD, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING); // Channel
|
||||
read(Types.SHORT); // Length
|
||||
handler(wrapper -> {
|
||||
final String channel = wrapper.get(Types.STRING, 0);
|
||||
switch (channel) {
|
||||
case "MC|TrSel": {
|
||||
wrapper.passthrough(Types.INT);
|
||||
wrapper.read(Types.REMAINING_BYTES); // unused data ???
|
||||
break;
|
||||
}
|
||||
case "MC|ItemName": {
|
||||
final byte[] data = wrapper.read(Types.REMAINING_BYTES);
|
||||
wrapper.write(Types.STRING, new String(data, StandardCharsets.UTF_8));
|
||||
|
||||
final InventoryTracker tracker = wrapper.user().get(InventoryTracker.class);
|
||||
final PacketWrapper updateCost = PacketWrapper.create(ClientboundPackets1_7_2_5.CONTAINER_SET_DATA, wrapper.user());
|
||||
updateCost.write(Types.UNSIGNED_BYTE, tracker.anvilId);
|
||||
updateCost.write(Types.SHORT, (short) 0);
|
||||
updateCost.write(Types.SHORT, tracker.levelCost);
|
||||
updateCost.send(Protocol1_8To1_7_6_10.class);
|
||||
break;
|
||||
}
|
||||
case "MC|BEdit":
|
||||
case "MC|BSign": {
|
||||
final Item book = wrapper.read(RewindTypes.COMPRESSED_NBT_ITEM);
|
||||
CompoundTag tag = book.tag();
|
||||
if (tag != null && tag.contains("pages")) {
|
||||
ListTag<StringTag> pages = tag.getListTag("pages", StringTag.class);
|
||||
for (int i = 0; i < pages.size(); i++) {
|
||||
StringTag page = pages.get(i);
|
||||
String value = page.getValue();
|
||||
value = ComponentUtil.legacyToJsonString(value);
|
||||
page.setValue(value);
|
||||
}
|
||||
}
|
||||
wrapper.write(Types.ITEM1_8, book);
|
||||
break;
|
||||
}
|
||||
case "MC|Brand": {
|
||||
wrapper.write(Types.STRING, new String(wrapper.read(Types.REMAINING_BYTES), StandardCharsets.UTF_8));
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
+246
@@ -0,0 +1,246 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.ScoreboardTracker;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public class ScoreboardPacketRewriter1_8 {
|
||||
|
||||
public static void register(Protocol1_8To1_7_6_10 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_OBJECTIVE, wrapper -> {
|
||||
String name = wrapper.passthrough(Types.STRING);
|
||||
if (name.length() > 16) {
|
||||
wrapper.set(Types.STRING, 0, name = name.substring(0, 16));
|
||||
}
|
||||
|
||||
final byte mode = wrapper.read(Types.BYTE);
|
||||
ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
|
||||
if (mode == 0) {
|
||||
if (scoreboard.objectiveExists(name)) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
scoreboard.addObjective(name);
|
||||
} else if (mode == 1) {
|
||||
if (!scoreboard.objectiveExists(name)) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
if (scoreboard.getColorIndependentSidebar() != null) {
|
||||
String username = wrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent()) {
|
||||
String sidebar = scoreboard.getColorDependentSidebar().get(color.get());
|
||||
if (name.equals(sidebar)) {
|
||||
final PacketWrapper sidebarPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
|
||||
sidebarPacket.write(Types.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Types.STRING, scoreboard.getColorIndependentSidebar());
|
||||
sidebarPacket.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
scoreboard.removeObjective(name);
|
||||
} else if (mode == 2) {
|
||||
if (!scoreboard.objectiveExists(name)) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (mode == 0 || mode == 2) {
|
||||
String displayName = wrapper.passthrough(Types.STRING);
|
||||
if (displayName.length() > 32) {
|
||||
wrapper.set(Types.STRING, 1, displayName.substring(0, 32));
|
||||
}
|
||||
wrapper.read(Types.STRING);
|
||||
} else {
|
||||
wrapper.write(Types.STRING, "");
|
||||
}
|
||||
wrapper.write(Types.BYTE, mode);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_SCORE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.STRING); // Name
|
||||
map(Types.VAR_INT, Types.BYTE); // Mode
|
||||
handler(wrapper -> {
|
||||
ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
|
||||
String name = wrapper.get(Types.STRING, 0);
|
||||
byte mode = wrapper.get(Types.BYTE, 0);
|
||||
|
||||
if (mode == 1) {
|
||||
name = scoreboard.removeTeamForScore(name);
|
||||
} else {
|
||||
name = scoreboard.sendTeamForScore(name);
|
||||
}
|
||||
|
||||
if (name.length() > 16) {
|
||||
name = ChatColorUtil.stripColor(name);
|
||||
if (name.length() > 16) {
|
||||
name = name.substring(0, 16);
|
||||
}
|
||||
}
|
||||
wrapper.set(Types.STRING, 0, name);
|
||||
|
||||
String objective = wrapper.read(Types.STRING);
|
||||
if (objective.length() > 16) {
|
||||
objective = objective.substring(0, 16);
|
||||
}
|
||||
|
||||
if (mode != 1) {
|
||||
int score = wrapper.read(Types.VAR_INT);
|
||||
wrapper.write(Types.STRING, objective);
|
||||
wrapper.write(Types.INT, score);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_DISPLAY_OBJECTIVE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BYTE); // Position
|
||||
map(Types.STRING); // Score name
|
||||
handler(wrapper -> {
|
||||
byte position = wrapper.get(Types.BYTE, 0);
|
||||
String name = wrapper.get(Types.STRING, 0);
|
||||
ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
|
||||
if (position > 2) { // team specific sidebar
|
||||
byte receiverTeamColor = (byte) (position - 3);
|
||||
scoreboard.getColorDependentSidebar().put(receiverTeamColor, name);
|
||||
|
||||
String username = wrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent() && color.get() == receiverTeamColor) {
|
||||
position = 1;
|
||||
} else {
|
||||
position = -1;
|
||||
}
|
||||
} else if (position == 1) { // team independent sidebar
|
||||
scoreboard.setColorIndependentSidebar(name);
|
||||
String username = wrapper.user().getProtocolInfo().getUsername();
|
||||
Optional<Byte> color = scoreboard.getPlayerTeamColor(username);
|
||||
if (color.isPresent() && scoreboard.getColorDependentSidebar().containsKey(color.get())) {
|
||||
position = -1;
|
||||
}
|
||||
}
|
||||
if (position == -1) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
wrapper.set(Types.BYTE, 0, position);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_PLAYER_TEAM, wrapper -> {
|
||||
final String team = wrapper.passthrough(Types.STRING);
|
||||
if (team == null) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
|
||||
final ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
|
||||
|
||||
final byte mode = wrapper.passthrough(Types.BYTE);
|
||||
if (mode != 0 && !scoreboard.teamExists(team)) {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
} else if (mode == 0 && scoreboard.teamExists(team)) {
|
||||
scoreboard.removeTeam(team);
|
||||
|
||||
final PacketWrapper removeTeam = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, wrapper.user());
|
||||
removeTeam.write(Types.STRING, team);
|
||||
removeTeam.write(Types.BYTE, (byte) 1);
|
||||
removeTeam.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
if (mode == 0) {
|
||||
scoreboard.addTeam(team);
|
||||
} else if (mode == 1) {
|
||||
scoreboard.removeTeam(team);
|
||||
}
|
||||
|
||||
if (mode == 0 || mode == 2) {
|
||||
wrapper.passthrough(Types.STRING); // Display name
|
||||
wrapper.passthrough(Types.STRING); // Prefix
|
||||
wrapper.passthrough(Types.STRING); // Suffix
|
||||
wrapper.passthrough(Types.BYTE); // Friendly fire
|
||||
wrapper.read(Types.STRING); // Name tag visibility
|
||||
byte color = wrapper.read(Types.BYTE);
|
||||
if (mode == 2 && scoreboard.getTeamColor(team).get() != color) {
|
||||
final String sidebar = scoreboard.getColorDependentSidebar().get(color);
|
||||
|
||||
final PacketWrapper sidebarPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
|
||||
sidebarPacket.write(Types.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Types.STRING, sidebar == null ? "" : sidebar);
|
||||
sidebarPacket.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
scoreboard.setTeamColor(team, color);
|
||||
}
|
||||
if (mode == 0 || mode == 3 || mode == 4) {
|
||||
byte color = scoreboard.getTeamColor(team).get();
|
||||
String[] entries = wrapper.read(Types.STRING_ARRAY);
|
||||
List<String> entryList = new ArrayList<>();
|
||||
|
||||
for (String entry : entries) {
|
||||
String username = wrapper.user().getProtocolInfo().getUsername();
|
||||
|
||||
if (mode == 4) {
|
||||
if (!scoreboard.isPlayerInTeam(entry, team)) {
|
||||
continue;
|
||||
}
|
||||
scoreboard.removePlayerFromTeam(entry, team);
|
||||
if (entry.equals(username)) {
|
||||
final PacketWrapper sidebarPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
|
||||
sidebarPacket.write(Types.BYTE, (byte) 1);
|
||||
sidebarPacket.write(Types.STRING, scoreboard.getColorIndependentSidebar() == null ? "" : scoreboard.getColorIndependentSidebar());
|
||||
sidebarPacket.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
} else {
|
||||
scoreboard.addPlayerToTeam(entry, team);
|
||||
if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
|
||||
final PacketWrapper displayObjective = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
|
||||
displayObjective.write(Types.BYTE, (byte) 1);
|
||||
displayObjective.write(Types.STRING, scoreboard.getColorDependentSidebar().get(color));
|
||||
displayObjective.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
entryList.add(entry);
|
||||
}
|
||||
|
||||
wrapper.write(Types.SHORT, (short) entryList.size());
|
||||
for (String entry : entryList) {
|
||||
wrapper.write(Types.STRING, entry);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
+288
@@ -0,0 +1,288 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
|
||||
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.WorldBorderEmulator;
|
||||
import com.viaversion.viarewind.api.type.chunk.ChunkType1_7_6;
|
||||
import com.viaversion.viarewind.api.type.chunk.BulkChunkType1_7_6;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.Particles1_8;
|
||||
import com.viaversion.viarewind.api.type.RewindTypes;
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
|
||||
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.api.type.types.FixedByteArrayType;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.BulkChunkType1_8;
|
||||
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_8;
|
||||
import com.viaversion.viaversion.api.minecraft.ClientWorld;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
import com.viaversion.viaversion.util.IdAndData;
|
||||
|
||||
public class WorldPacketRewriter1_8 {
|
||||
|
||||
public static void register(Protocol1_8To1_7_6_10 protocol) {
|
||||
protocol.registerClientbound(ClientboundPackets1_8.LEVEL_CHUNK, wrapper -> {
|
||||
final ClientWorld world = wrapper.user().get(ClientWorld.class);
|
||||
final Chunk chunk = wrapper.read(ChunkType1_8.forEnvironment(world.getEnvironment()));
|
||||
protocol.getItemRewriter().handleChunk(chunk);
|
||||
|
||||
wrapper.write(ChunkType1_7_6.TYPE, chunk);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_UPDATE, new PacketHandlers() {
|
||||
@Override
|
||||
protected void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.U_BYTE_POSITION); // Position
|
||||
handler(wrapper -> {
|
||||
int data = wrapper.read(Types.VAR_INT); // Block data
|
||||
data = protocol.getItemRewriter().handleBlockId(data);
|
||||
|
||||
wrapper.write(Types.VAR_INT, IdAndData.getId(data)); // Block id
|
||||
wrapper.write(Types.UNSIGNED_BYTE, (short) IdAndData.getData(data)); // Block data
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.CHUNK_BLOCKS_UPDATE, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT); // Chunk x
|
||||
map(Types.INT); // Chunk z
|
||||
|
||||
handler(wrapper -> {
|
||||
final BlockChangeRecord[] records = wrapper.read(Types.BLOCK_CHANGE_ARRAY);
|
||||
|
||||
wrapper.write(Types.SHORT, (short) records.length); // Record count
|
||||
wrapper.write(Types.INT, records.length * 4); // Data array length (position + block id)
|
||||
|
||||
for (BlockChangeRecord record : records) {
|
||||
wrapper.write(Types.SHORT, (short) (record.getSectionX() << 12 | record.getSectionZ() << 8 | record.getY())); // Position
|
||||
wrapper.write(Types.SHORT, (short) protocol.getItemRewriter().handleBlockId(record.getBlockId())); // Block id
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_EVENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // Position
|
||||
map(Types.UNSIGNED_BYTE); // Type
|
||||
map(Types.UNSIGNED_BYTE); // Data
|
||||
map(Types.VAR_INT); // Block id
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_DESTRUCTION, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.VAR_INT); // Entity id
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.INT_POSITION); // Position
|
||||
map(Types.BYTE); // Progress
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MAP_BULK_CHUNK, wrapper -> {
|
||||
final Chunk[] chunks = wrapper.read(BulkChunkType1_8.TYPE);
|
||||
for (Chunk chunk : chunks) {
|
||||
protocol.getItemRewriter().handleChunk(chunk);
|
||||
}
|
||||
|
||||
wrapper.write(BulkChunkType1_7_6.TYPE, chunks);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.LEVEL_EVENT, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.INT); // Effect id
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.BYTE_POSITION); // Position
|
||||
map(Types.INT); // Data
|
||||
map(Types.BOOLEAN); // Disable relative volume
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.LEVEL_PARTICLES, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
handler(wrapper -> {
|
||||
final int particleId = wrapper.read(Types.INT); // Particle id
|
||||
Particles1_8 particle = Particles1_8.find(particleId);
|
||||
if (particle == null) {
|
||||
particle = Particles1_8.CRIT;
|
||||
}
|
||||
wrapper.write(Types.STRING, particle.name); // Particle name
|
||||
|
||||
});
|
||||
read(Types.BOOLEAN); // Long distance
|
||||
map(Types.FLOAT); // X
|
||||
map(Types.FLOAT); // Y
|
||||
map(Types.FLOAT); // Z
|
||||
map(Types.FLOAT); // Offset x
|
||||
map(Types.FLOAT); // Offset y
|
||||
map(Types.FLOAT); // Offset z
|
||||
map(Types.FLOAT); // Particle data
|
||||
map(Types.INT); // Particle count
|
||||
handler(wrapper -> {
|
||||
String name = wrapper.get(Types.STRING, 0);
|
||||
Particles1_8 particle = Particles1_8.find(name);
|
||||
|
||||
if (particle == Particles1_8.ICON_CRACK || particle == Particles1_8.BLOCK_CRACK || particle == Particles1_8.BLOCK_DUST) {
|
||||
int id = wrapper.read(Types.VAR_INT);
|
||||
int data = particle == Particles1_8.ICON_CRACK ? wrapper.read(Types.VAR_INT) : id / 4096;
|
||||
id %= 4096;
|
||||
if (id >= 256 && id <= 422 || id >= 2256 && id <= 2267) { //item
|
||||
particle = Particles1_8.ICON_CRACK;
|
||||
} else if (id >= 0 && id <= 164 || id >= 170 && id <= 175) {
|
||||
if (particle == Particles1_8.ICON_CRACK)
|
||||
particle = Particles1_8.BLOCK_CRACK;
|
||||
} else {
|
||||
wrapper.cancel();
|
||||
return;
|
||||
}
|
||||
name = particle.name + "_" + id + "_" + data;
|
||||
}
|
||||
|
||||
wrapper.set(Types.STRING, 0, name);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.UPDATE_SIGN, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // position
|
||||
handler(wrapper -> {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
String line = wrapper.read(Types.STRING);
|
||||
line = ChatUtil.jsonToLegacy(wrapper.user(), line);
|
||||
line = ChatUtil.removeUnusedColor(line, '0');
|
||||
|
||||
if (line.length() > 15) {
|
||||
line = ChatColorUtil.stripColor(line);
|
||||
if (line.length() > 15) line = line.substring(0, 15);
|
||||
}
|
||||
wrapper.write(Types.STRING, line);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper -> {
|
||||
wrapper.cancel();
|
||||
final int id = wrapper.read(Types.VAR_INT);
|
||||
final byte scale = wrapper.read(Types.BYTE);
|
||||
|
||||
final int iconCount = wrapper.read(Types.VAR_INT);
|
||||
byte[] icons = new byte[iconCount * 4];
|
||||
for (int i = 0; i < iconCount; i++) {
|
||||
final int directionAndType = wrapper.read(Types.BYTE);
|
||||
|
||||
icons[i * 4] = (byte) (directionAndType >> 4 & 0xF);
|
||||
icons[i * 4 + 1] = wrapper.read(Types.BYTE); // x
|
||||
icons[i * 4 + 2] = wrapper.read(Types.BYTE); // z
|
||||
icons[i * 4 + 3] = (byte) (directionAndType & 0xF);
|
||||
}
|
||||
final short columns = wrapper.read(Types.UNSIGNED_BYTE);
|
||||
if (columns > 0) {
|
||||
final short rows = wrapper.read(Types.UNSIGNED_BYTE);
|
||||
final short x = wrapper.read(Types.UNSIGNED_BYTE);
|
||||
final short z = wrapper.read(Types.UNSIGNED_BYTE);
|
||||
|
||||
final byte[] data = wrapper.read(Types.BYTE_ARRAY_PRIMITIVE);
|
||||
for (int column = 0; column < columns; column++) {
|
||||
byte[] columnData = new byte[rows + 3];
|
||||
columnData[0] = 0;
|
||||
columnData[1] = (byte) (x + column);
|
||||
columnData[2] = (byte) z;
|
||||
|
||||
for (int i = 0; i < rows; i++) {
|
||||
columnData[i + 3] = data[column + i * columns];
|
||||
}
|
||||
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper.user());
|
||||
mapData.write(Types.VAR_INT, id); // map id
|
||||
mapData.write(Types.SHORT, (short) columnData.length); // data length
|
||||
mapData.write(new FixedByteArrayType(columnData.length), columnData); // data
|
||||
|
||||
mapData.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
}
|
||||
|
||||
if (iconCount > 0) {
|
||||
final byte[] iconData = new byte[iconCount * 3 + 1];
|
||||
iconData[0] = 1;
|
||||
for (int i = 0; i < iconCount; i++) {
|
||||
iconData[i * 3 + 1] = (byte) (icons[i * 4] << 4 | icons[i * 4 + 3] & 0xF);
|
||||
iconData[i * 3 + 2] = icons[i * 4 + 1];
|
||||
iconData[i * 3 + 3] = icons[i * 4 + 2];
|
||||
}
|
||||
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper.user());
|
||||
mapData.write(Types.VAR_INT, id); // map id
|
||||
mapData.write(Types.SHORT, (short) iconData.length); // data length
|
||||
mapData.write(new FixedByteArrayType(iconData.length), iconData); // data
|
||||
|
||||
mapData.send(Protocol1_8To1_7_6_10.class);
|
||||
}
|
||||
|
||||
// Update scale
|
||||
final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper.user());
|
||||
mapData.write(Types.VAR_INT, id); // map id
|
||||
mapData.write(Types.SHORT, (short) 2); // data length
|
||||
mapData.write(new FixedByteArrayType(2), new byte[]{2, scale}); // data
|
||||
|
||||
mapData.send(Protocol1_8To1_7_6_10.class);
|
||||
});
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.BLOCK_ENTITY_DATA, new PacketHandlers() {
|
||||
@Override
|
||||
public void register() {
|
||||
map(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // position
|
||||
map(Types.UNSIGNED_BYTE); // action
|
||||
map(Types.NAMED_COMPOUND_TAG, RewindTypes.COMPRESSED_NBT); // nbt
|
||||
}
|
||||
});
|
||||
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.CHANGE_DIFFICULTY);
|
||||
protocol.cancelClientbound(ClientboundPackets1_8.PLAYER_COMBAT);
|
||||
|
||||
protocol.registerClientbound(ClientboundPackets1_8.SET_BORDER, null, wrapper -> {
|
||||
final WorldBorderEmulator emulator = wrapper.user().get(WorldBorderEmulator.class);
|
||||
wrapper.cancel();
|
||||
|
||||
final int action = wrapper.read(Types.VAR_INT);
|
||||
if (action == 0) { // set size
|
||||
emulator.setSize(wrapper.read(Types.DOUBLE)); // radius
|
||||
} else if (action == 1) { // lerp size
|
||||
emulator.lerpSize(wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), wrapper.read(Types.VAR_LONG)); // old radius, new radius, speed
|
||||
} else if (action == 2) { // set center
|
||||
emulator.setCenter(wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE)); // x, z
|
||||
} else if (action == 3) { // initialize
|
||||
emulator.init(
|
||||
wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), // x, z
|
||||
wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), // old radius, new radius
|
||||
wrapper.read(Types.VAR_LONG) // speed
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
+2
-3
@@ -15,14 +15,13 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
|
||||
/**
|
||||
* @see com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.CompressionHandlerProvider
|
||||
* @see com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider
|
||||
*/
|
||||
public class CompressionStatusTracker extends StoredObject {
|
||||
public boolean removeCompression = false;
|
||||
+183
@@ -0,0 +1,183 @@
|
||||
/*
|
||||
* This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
|
||||
* Copyright (C) 2018-2024 ViaVersion 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.VirtualHologramEntity;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
|
||||
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2IntArrayMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2IntMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectArrayMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
|
||||
import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class EntityTracker1_8 extends EntityTrackerBase {
|
||||
|
||||
private final Int2ObjectMap<VirtualHologramEntity> holograms = new Int2ObjectArrayMap<>();
|
||||
private final Int2IntMap vehicles = new Int2IntArrayMap();
|
||||
private final Int2ObjectMap<UUID> entityIdToUUID = new Int2ObjectArrayMap<>();
|
||||
private final Object2IntMap<UUID> entityUUIDToId = new Object2IntOpenHashMap<>();
|
||||
|
||||
public int spectatingClientEntityId = -1;
|
||||
private int clientEntityGameMode;
|
||||
|
||||
public EntityTracker1_8(UserConnection connection) {
|
||||
super(connection, EntityTypes1_8.EntityType.PLAYER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addEntity(int id, EntityType type) {
|
||||
super.addEntity(id, type);
|
||||
if (type == EntityTypes1_8.EntityType.ARMOR_STAND) {
|
||||
holograms.put(id, new VirtualHologramEntity(user(), id));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeEntity(int entityId) {
|
||||
super.removeEntity(entityId);
|
||||
|
||||
if (entityIdToUUID.containsKey(entityId)) {
|
||||
final UUID playerId = entityIdToUUID.remove(entityId);
|
||||
|
||||
entityUUIDToId.removeInt(playerId);
|
||||
user().get(PlayerSessionStorage.class).getPlayerEquipment().remove(playerId);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clearEntities() {
|
||||
super.clearEntities();
|
||||
vehicles.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setClientEntityId(int entityId) {
|
||||
if (this.spectatingClientEntityId == this.clientEntityId()) {
|
||||
this.spectatingClientEntityId = entityId;
|
||||
}
|
||||
super.setClientEntityId(entityId);
|
||||
}
|
||||
|
||||
public void addPlayer(final int entityId, final UUID uuid) {
|
||||
entityUUIDToId.put(uuid, entityId);
|
||||
entityIdToUUID.put(entityId, uuid);
|
||||
}
|
||||
|
||||
public UUID getPlayerUUID(final int entityId) {
|
||||
return entityIdToUUID.get(entityId);
|
||||
}
|
||||
|
||||
public int getPlayerEntityId(final UUID uuid) {
|
||||
return entityUUIDToId.getOrDefault(uuid, -1);
|
||||
}
|
||||
|
||||
public int getVehicle(final int passengerId) {
|
||||
for (Map.Entry<Integer, Integer> vehicle : vehicles.entrySet()) {
|
||||
if (vehicle.getValue() == passengerId) {
|
||||
return vehicle.getValue();
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
public int getPassenger(int vehicleId) {
|
||||
return vehicles.getOrDefault(vehicleId, -1);
|
||||
}
|
||||
|
||||
protected void startSneaking() {
|
||||
try {
|
||||
final PacketWrapper entityAction = PacketWrapper.create(ServerboundPackets1_7_2_5.PLAYER_COMMAND, user());
|
||||
entityAction.write(Types.VAR_INT, this.clientEntityId()); // Entity id
|
||||
entityAction.write(Types.VAR_INT, 0); // Action id
|
||||
entityAction.write(Types.VAR_INT, 0); // Jump boost
|
||||
|
||||
entityAction.sendToServer(Protocol1_8To1_7_6_10.class);
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.SEVERE, "Failed to send sneak packet", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setPassenger(final int vehicleId, final int passengerId) {
|
||||
if (vehicleId == this.spectatingClientEntityId && this.spectatingClientEntityId != this.clientEntityId()) {
|
||||
startSneaking();
|
||||
setSpectating(this.clientEntityId());
|
||||
}
|
||||
|
||||
if (vehicleId == -1) {
|
||||
vehicles.remove(getVehicle(passengerId));
|
||||
} else if (passengerId == -1) {
|
||||
vehicles.remove(vehicleId);
|
||||
} else {
|
||||
vehicles.put(vehicleId, passengerId);
|
||||
}
|
||||
}
|
||||
|
||||
protected void attachEntity(final int target) {
|
||||
try {
|
||||
final PacketWrapper attachEntity = PacketWrapper.create(ClientboundPackets1_8.SET_ENTITY_LINK, user());
|
||||
attachEntity.write(Types.INT, this.clientEntityId()); // vehicle id
|
||||
attachEntity.write(Types.INT, target); // passenger id
|
||||
attachEntity.write(Types.BOOLEAN, false); // leash
|
||||
|
||||
attachEntity.scheduleSend(Protocol1_8To1_7_6_10.class);
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.SEVERE, "Failed to send attach packet", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setSpectating(int spectating) {
|
||||
if (spectating != this.clientEntityId() && getPassenger(spectating) != -1) {
|
||||
startSneaking();
|
||||
setSpectating(this.clientEntityId());
|
||||
return;
|
||||
}
|
||||
if (this.spectatingClientEntityId != spectating && this.spectatingClientEntityId != this.clientEntityId()) {
|
||||
attachEntity(-1);
|
||||
}
|
||||
this.spectatingClientEntityId = spectating;
|
||||
if (spectating != this.clientEntityId()) {
|
||||
attachEntity(this.spectatingClientEntityId);
|
||||
}
|
||||
}
|
||||
|
||||
public Int2ObjectMap<VirtualHologramEntity> getHolograms() {
|
||||
return holograms;
|
||||
}
|
||||
|
||||
public boolean isSpectator() {
|
||||
return clientEntityGameMode == 3;
|
||||
}
|
||||
|
||||
public void setClientEntityGameMode(int clientEntityGameMode) {
|
||||
this.clientEntityGameMode = clientEntityGameMode;
|
||||
}
|
||||
}
|
||||
+4
-5
@@ -15,17 +15,16 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
import com.viaversion.viarewind.utils.ChatUtil;
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.item.DataItem;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
|
||||
import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
|
||||
import com.viaversion.nbt.tag.CompoundTag;
|
||||
import com.viaversion.nbt.tag.ListTag;
|
||||
import com.viaversion.nbt.tag.StringTag;
|
||||
import com.viaversion.viaversion.util.ChatColorUtil;
|
||||
|
||||
import java.util.*;
|
||||
+11
-6
@@ -15,20 +15,16 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.FurnaceData;
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
public class InventoryTracker extends StoredObject {
|
||||
public final static Map<String, Integer> WINDOW_TYPE_REGISTRY = new HashMap<>();
|
||||
public static final Map<String, Integer> WINDOW_TYPE_REGISTRY = new HashMap<>();
|
||||
|
||||
static {
|
||||
WINDOW_TYPE_REGISTRY.put("minecraft:container", 0);
|
||||
@@ -76,4 +72,13 @@ public class InventoryTracker extends StoredObject {
|
||||
public HashMap<Short, FurnaceData> getFurnaceData() {
|
||||
return furnaceData;
|
||||
}
|
||||
|
||||
public static class FurnaceData {
|
||||
|
||||
public short fuelLeft = 0;
|
||||
public short maxFuel = 0;
|
||||
public short progress = 0;
|
||||
public short maxProgress = 200;
|
||||
}
|
||||
|
||||
}
|
||||
+1
-9
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
@@ -28,9 +27,6 @@ import java.util.UUID;
|
||||
|
||||
public class PlayerSessionStorage extends StoredObject {
|
||||
|
||||
// Player info
|
||||
public int gameMode;
|
||||
|
||||
// Player abilities
|
||||
public boolean sprinting, allowFly, flying, invincible, creative;
|
||||
public float flySpeed, walkSpeed;
|
||||
@@ -95,10 +91,6 @@ public class PlayerSessionStorage extends StoredObject {
|
||||
items[slot] = equipment;
|
||||
}
|
||||
|
||||
public boolean isSpectator() {
|
||||
return gameMode == 3;
|
||||
}
|
||||
|
||||
public Map<UUID, Item[]> getPlayerEquipment() {
|
||||
return playerEquipment;
|
||||
}
|
||||
+20
-22
@@ -15,20 +15,18 @@
|
||||
* 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 com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.utils.PacketUtil;
|
||||
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class Scoreboard extends StoredObject {
|
||||
public class ScoreboardTracker extends StoredObject {
|
||||
private final HashMap<String, List<String>> teams = new HashMap<>();
|
||||
private final HashSet<String> objectives = new HashSet<>();
|
||||
private final HashMap<String, ScoreTeam> scoreTeams = new HashMap<>();
|
||||
@@ -37,7 +35,7 @@ public class Scoreboard extends StoredObject {
|
||||
private String colorIndependentSidebar;
|
||||
private final HashMap<Byte, String> colorDependentSidebar = new HashMap<>();
|
||||
|
||||
public Scoreboard(UserConnection user) {
|
||||
public ScoreboardTracker(UserConnection user) {
|
||||
super(user);
|
||||
}
|
||||
|
||||
@@ -134,16 +132,16 @@ public class Scoreboard extends StoredObject {
|
||||
scoreTeams.put(score, scoreTeam);
|
||||
scoreTeamNames.add(name);
|
||||
|
||||
PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.TEAMS, getUser());
|
||||
teamPacket.write(Type.STRING, name);
|
||||
teamPacket.write(Type.BYTE, (byte) 0);
|
||||
teamPacket.write(Type.STRING, "ViaRewind");
|
||||
teamPacket.write(Type.STRING, prefix);
|
||||
teamPacket.write(Type.STRING, suffix);
|
||||
teamPacket.write(Type.BYTE, (byte) 0);
|
||||
teamPacket.write(Type.SHORT, (short) 1);
|
||||
teamPacket.write(Type.STRING, name);
|
||||
PacketUtil.sendPacket(teamPacket, Protocol1_7_6_10To1_8.class, true, true);
|
||||
PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
|
||||
teamPacket.write(Types.STRING, name);
|
||||
teamPacket.write(Types.BYTE, (byte) 0);
|
||||
teamPacket.write(Types.STRING, "ViaRewind");
|
||||
teamPacket.write(Types.STRING, prefix);
|
||||
teamPacket.write(Types.STRING, suffix);
|
||||
teamPacket.write(Types.BYTE, (byte) 0);
|
||||
teamPacket.write(Types.SHORT, (short) 1);
|
||||
teamPacket.write(Types.STRING, name);
|
||||
teamPacket.send(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
return name;
|
||||
}
|
||||
@@ -153,10 +151,10 @@ public class Scoreboard extends StoredObject {
|
||||
if (scoreTeam == null) return score;
|
||||
scoreTeamNames.remove(scoreTeam.name);
|
||||
|
||||
PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.TEAMS, getUser());
|
||||
teamPacket.write(Type.STRING, scoreTeam.name);
|
||||
teamPacket.write(Type.BYTE, (byte) 1);
|
||||
PacketUtil.sendPacket(teamPacket, Protocol1_7_6_10To1_8.class, true, true);
|
||||
PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
|
||||
teamPacket.write(Types.STRING, scoreTeam.name);
|
||||
teamPacket.write(Types.BYTE, (byte) 1);
|
||||
teamPacket.send(Protocol1_8To1_7_6_10.class);
|
||||
|
||||
return scoreTeam.name;
|
||||
}
|
||||
+1
-2
@@ -15,8 +15,7 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.StoredObject;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
+18
-19
@@ -15,23 +15,22 @@
|
||||
* 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 com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.task;
|
||||
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.task;
|
||||
|
||||
import com.viaversion.viarewind.ViaRewind;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.WorldBorderEmulator;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.PlayerSessionStorage;
|
||||
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.WorldBorderEmulator;
|
||||
import com.viaversion.viaversion.api.Via;
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
|
||||
import com.viaversion.viaversion.api.type.Type;
|
||||
import com.viaversion.viaversion.protocols.protocol1_8.ClientboundPackets1_8;
|
||||
import com.viaversion.viaversion.api.type.Types;
|
||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class WorldBorderUpdateTask implements Runnable {
|
||||
public final static int VIEW_DISTANCE = 16;
|
||||
public static final int VIEW_DISTANCE = 16;
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
@@ -74,19 +73,19 @@ public class WorldBorderUpdateTask implements Runnable {
|
||||
|
||||
double particleOffset = 2.5;
|
||||
|
||||
final PacketWrapper spawnParticle = PacketWrapper.create(ClientboundPackets1_8.SPAWN_PARTICLE, connection);
|
||||
spawnParticle.write(Type.STRING, ViaRewind.getConfig().getWorldBorderParticle()); // particle name
|
||||
spawnParticle.write(Type.FLOAT, (float) (side.modX != 0 ? worldBorderEmulatorTracker.getX() + (radius * side.modX) : centerH)); // x
|
||||
spawnParticle.write(Type.FLOAT, (float) centerV); // y
|
||||
spawnParticle.write(Type.FLOAT, (float) (side.modX == 0 ? worldBorderEmulatorTracker.getZ() + (radius * side.modZ) : centerH)); // z
|
||||
spawnParticle.write(Type.FLOAT, (float) (side.modX != 0 ? 0f : (maxH - minH) / particleOffset)); // offset x
|
||||
spawnParticle.write(Type.FLOAT, (float) ((maxV - minV) / particleOffset)); // offset y
|
||||
spawnParticle.write(Type.FLOAT, (float) (side.modX == 0 ? 0f : (maxH - minH) / particleOffset)); // offset z
|
||||
spawnParticle.write(Type.FLOAT, 0F); // particle data
|
||||
spawnParticle.write(Type.INT, (int) Math.floor((maxH - minH) * (maxV - minV) * 0.5));
|
||||
final PacketWrapper spawnParticle = PacketWrapper.create(ClientboundPackets1_8.LEVEL_PARTICLES, connection);
|
||||
spawnParticle.write(Types.STRING, ViaRewind.getConfig().getWorldBorderParticle()); // particle name
|
||||
spawnParticle.write(Types.FLOAT, (float) (side.modX != 0 ? worldBorderEmulatorTracker.getX() + (radius * side.modX) : centerH)); // x
|
||||
spawnParticle.write(Types.FLOAT, (float) centerV); // y
|
||||
spawnParticle.write(Types.FLOAT, (float) (side.modX == 0 ? worldBorderEmulatorTracker.getZ() + (radius * side.modZ) : centerH)); // z
|
||||
spawnParticle.write(Types.FLOAT, (float) (side.modX != 0 ? 0f : (maxH - minH) / particleOffset)); // offset x
|
||||
spawnParticle.write(Types.FLOAT, (float) ((maxV - minV) / particleOffset)); // offset y
|
||||
spawnParticle.write(Types.FLOAT, (float) (side.modX == 0 ? 0f : (maxH - minH) / particleOffset)); // offset z
|
||||
spawnParticle.write(Types.FLOAT, 0F); // particle data
|
||||
spawnParticle.write(Types.INT, (int) Math.floor((maxH - minH) * (maxV - minV) * 0.5));
|
||||
|
||||
try {
|
||||
spawnParticle.send(Protocol1_7_6_10To1_8.class, true);
|
||||
spawnParticle.send(Protocol1_8To1_7_6_10.class);
|
||||
} catch (Exception e) {
|
||||
ViaRewind.getPlatform().getLogger().log(Level.SEVERE, "Failed to send world border particle", e);
|
||||
}
|
||||
Loaded 100 of 150 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user