-
-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Full 1.20.5 client and server support
- Loading branch information
Showing
31 changed files
with
7,393 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/main/java/net/raphimc/viaproxy/injection/interfaces/IBlockItemPacketRewriter1_20_5.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy | ||
| * Copyright (C) 2021-2024 RK_01/RaphiMC 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 net.raphimc.viaproxy.injection.interfaces; | ||
|
|
||
| public interface IBlockItemPacketRewriter1_20_5 { | ||
|
|
||
| void onMappingDataLoaded(); | ||
|
|
||
| } |
213 changes: 213 additions & 0 deletions
213
src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,213 @@ | ||
| /* | ||
| * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy | ||
| * Copyright (C) 2021-2024 RK_01/RaphiMC 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 net.raphimc.viaproxy.injection.mixins; | ||
|
|
||
| import com.viaversion.viaversion.api.connection.UserConnection; | ||
| import com.viaversion.viaversion.api.minecraft.HolderSet; | ||
| import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer; | ||
| import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey; | ||
| import com.viaversion.viaversion.api.minecraft.item.Item; | ||
| import com.viaversion.viaversion.api.minecraft.item.data.FoodEffect; | ||
| import com.viaversion.viaversion.api.minecraft.item.data.FoodProperties; | ||
| import com.viaversion.viaversion.api.minecraft.item.data.ToolProperties; | ||
| import com.viaversion.viaversion.api.minecraft.item.data.ToolRule; | ||
| import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; | ||
| import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet; | ||
| import com.viaversion.viaversion.libs.fastutil.ints.IntSet; | ||
| import com.viaversion.viaversion.libs.gson.JsonArray; | ||
| import com.viaversion.viaversion.libs.gson.JsonElement; | ||
| import com.viaversion.viaversion.libs.gson.JsonObject; | ||
| import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPacket1_20_3; | ||
| import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; | ||
| import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; | ||
| import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.rewriter.BlockItemPacketRewriter1_20_5; | ||
| import com.viaversion.viaversion.rewriter.ItemRewriter; | ||
| import net.raphimc.vialegacy.api.LegacyProtocolVersion; | ||
| import net.raphimc.viaproxy.injection.interfaces.IBlockItemPacketRewriter1_20_5; | ||
| import net.raphimc.viaproxy.protocoltranslator.impl.ViaProxyMappingDataLoader; | ||
| import net.raphimc.viaproxy.util.logging.Logger; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| @Mixin(value = BlockItemPacketRewriter1_20_5.class, remap = false) | ||
| public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<ClientboundPacket1_20_3, ServerboundPacket1_20_5, Protocol1_20_5To1_20_3> implements IBlockItemPacketRewriter1_20_5 { | ||
|
|
||
| @Unique | ||
| private final Set<String> foodItems_b1_7_3 = new HashSet<>(); | ||
|
|
||
| @Unique | ||
| private final Map<String, Integer> armorMaxDamage_b1_8_1 = new HashMap<>(); | ||
|
|
||
| @Unique | ||
| private final Set<String> swordItems1_8 = new HashSet<>(); | ||
|
|
||
| @Unique | ||
| private final Map<ProtocolVersion, Map<String, ToolProperties>> toolDataChanges = new LinkedHashMap<>(); | ||
|
|
||
| public MixinBlockItemPacketRewriter1_20_5() { | ||
| super(null, null, null, null, null); | ||
| } | ||
|
|
||
| @Override | ||
| public void onMappingDataLoaded() { | ||
| this.foodItems_b1_7_3.add("minecraft:apple"); | ||
| this.foodItems_b1_7_3.add("minecraft:mushroom_stew"); | ||
| this.foodItems_b1_7_3.add("minecraft:bread"); | ||
| this.foodItems_b1_7_3.add("minecraft:porkchop"); | ||
| this.foodItems_b1_7_3.add("minecraft:cooked_porkchop"); | ||
| this.foodItems_b1_7_3.add("minecraft:golden_apple"); | ||
| this.foodItems_b1_7_3.add("minecraft:cod"); | ||
| this.foodItems_b1_7_3.add("minecraft:cooked_cod"); | ||
| this.foodItems_b1_7_3.add("minecraft:cookie"); | ||
|
|
||
| this.armorMaxDamage_b1_8_1.put("minecraft:leather_helmet", 33); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:leather_chestplate", 48); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:leather_leggings", 45); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:leather_boots", 39); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:chainmail_helmet", 66); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:chainmail_chestplate", 96); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:chainmail_leggings", 90); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:chainmail_boots", 78); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:iron_helmet", 132); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:iron_chestplate", 192); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:iron_leggings", 180); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:iron_boots", 156); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:diamond_helmet", 264); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:diamond_chestplate", 384); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:diamond_leggings", 360); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:diamond_boots", 312); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:golden_helmet", 66); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:golden_chestplate", 96); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:golden_leggings", 90); | ||
| this.armorMaxDamage_b1_8_1.put("minecraft:golden_boots", 78); | ||
|
|
||
| this.swordItems1_8.add("minecraft:wooden_sword"); | ||
| this.swordItems1_8.add("minecraft:stone_sword"); | ||
| this.swordItems1_8.add("minecraft:iron_sword"); | ||
| this.swordItems1_8.add("minecraft:golden_sword"); | ||
| this.swordItems1_8.add("minecraft:diamond_sword"); | ||
|
|
||
| final JsonObject itemToolComponents = ViaProxyMappingDataLoader.INSTANCE.loadData("item-tool-components.json"); | ||
| for (Map.Entry<String, JsonElement> entry : itemToolComponents.entrySet()) { | ||
| int attempts = 0; | ||
| while (ProtocolVersion.getClosest(entry.getKey()) == null) { | ||
| try { | ||
| Thread.sleep(100); | ||
| if (attempts++ > 100) { // 10 seconds | ||
| Logger.LOGGER.warn("Failed to load item-tool-components.json after 10 seconds. Skipping entry."); | ||
| break; | ||
| } | ||
| } catch (InterruptedException e) { | ||
| break; | ||
| } | ||
| } | ||
| final ProtocolVersion version = ProtocolVersion.getClosest(entry.getKey()); | ||
| if (version == null) { // Only happens if the timeout above is reached or the thread is interrupted | ||
| continue; | ||
| } | ||
| final Map<String, ToolProperties> toolProperties = new HashMap<>(); | ||
| final JsonArray toolComponents = entry.getValue().getAsJsonArray(); | ||
| for (JsonElement toolComponent : toolComponents) { | ||
| final JsonObject toolComponentObject = toolComponent.getAsJsonObject(); | ||
| final String item = toolComponentObject.get("item").getAsString(); | ||
| final float defaultMiningSpeed = toolComponentObject.get("default_mining_speed").getAsFloat(); | ||
| final int damagePerBlock = toolComponentObject.get("damage_per_block").getAsInt(); | ||
| final int[] suitableFor = this.blockJsonArrayToIds(version, toolComponentObject.getAsJsonArray("suitable_for")); | ||
| final List<ToolRule> toolRules = new ArrayList<>(); | ||
| final JsonArray miningSpeeds = toolComponentObject.getAsJsonArray("mining_speeds"); | ||
| for (JsonElement miningSpeed : miningSpeeds) { | ||
| final JsonObject miningSpeedObject = miningSpeed.getAsJsonObject(); | ||
| final int[] blocks = this.blockJsonArrayToIds(version, miningSpeedObject.getAsJsonArray("blocks")); | ||
| final float speed = miningSpeedObject.get("speed").getAsFloat(); | ||
| toolRules.add(new ToolRule(HolderSet.of(blocks), speed, null)); | ||
| } | ||
| if (suitableFor.length > 0) { | ||
| toolRules.add(new ToolRule(HolderSet.of(suitableFor), null, true)); | ||
| } | ||
| toolProperties.put(item, new ToolProperties(toolRules.toArray(new ToolRule[0]), defaultMiningSpeed, damagePerBlock)); | ||
| } | ||
| this.toolDataChanges.put(version, toolProperties); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "toStructuredItem", at = @At("RETURN")) | ||
| private void appendItemDataFixComponents(UserConnection connection, Item old, CallbackInfoReturnable<Item> cir) { | ||
| final StructuredDataContainer data = cir.getReturnValue().structuredData(); | ||
| final String identifier = this.protocol.getMappingData().getFullItemMappings().identifier(cir.getReturnValue().identifier()); | ||
| if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_17_1)) { | ||
| if (identifier.equals("minecraft:crossbow")) { | ||
| data.set(StructuredDataKey.MAX_DAMAGE, 326); | ||
| } | ||
| } | ||
| if (connection.getProtocolInfo().serverProtocolVersion().betweenInclusive(LegacyProtocolVersion.b1_8tob1_8_1, ProtocolVersion.v1_8)) { | ||
| if (this.swordItems1_8.contains(identifier)) { | ||
| data.set(StructuredDataKey.FOOD, new FoodProperties(0, 0F, true, 3600, new FoodEffect[0])); | ||
| } | ||
| } | ||
| if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_8tob1_8_1)) { | ||
| if (this.armorMaxDamage_b1_8_1.containsKey(identifier)) { | ||
| data.set(StructuredDataKey.MAX_DAMAGE, this.armorMaxDamage_b1_8_1.get(identifier)); | ||
| } | ||
| } | ||
| if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) { | ||
| if (this.foodItems_b1_7_3.contains(identifier)) { | ||
| data.set(StructuredDataKey.MAX_STACK_SIZE, 1); | ||
| data.addEmpty(StructuredDataKey.FOOD); | ||
| } | ||
| } | ||
|
|
||
| for (Map.Entry<ProtocolVersion, Map<String, ToolProperties>> entry : this.toolDataChanges.entrySet()) { | ||
| if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(entry.getKey())) { | ||
| final ToolProperties toolProperties = entry.getValue().get(identifier); | ||
| if (toolProperties != null) { | ||
| data.set(StructuredDataKey.TOOL, toolProperties); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Unique | ||
| private int[] blockJsonArrayToIds(final ProtocolVersion protocolVersion, final JsonArray jsonArray) { | ||
| final IntSet ids = new IntOpenHashSet(); | ||
| for (final JsonElement element : jsonArray) { | ||
| final String name = element.getAsString(); | ||
| if (name.startsWith("#")) { // Material name | ||
| final String material = name.substring(1); | ||
| for (Map.Entry<String, Map<ProtocolVersion, String>> entry : ViaProxyMappingDataLoader.BLOCK_MATERIALS.entrySet()) { | ||
| for (Map.Entry<ProtocolVersion, String> materialEntry : entry.getValue().entrySet()) { | ||
| if (protocolVersion.olderThanOrEqualTo(materialEntry.getKey()) && materialEntry.getValue().equals(material)) { | ||
| ids.add(this.protocol.getMappingData().blockId(entry.getKey())); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } else { // Block name | ||
| ids.add(this.protocol.getMappingData().blockId(element.getAsString())); | ||
| } | ||
| } | ||
| return ids.toIntArray(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.