Skip to content

Commit

Permalink
fix(spigot): special pricing information being lost on recent MC vers…
Browse files Browse the repository at this point in the history 
…ions

Migrated to ProtocolLib's converter which uses the Bukkit API.
Unfortunately, versions of the Bukkit API on 1.17 and below do not
include all required fields, so villager translation support for them
was dropped in this commit.

Fixes #421

Backport of 10f1a09 to v3
  • Loading branch information
@diogotcorreia
diogotcorreia committed Jul 15, 2024
1 parent 3f87646 commit 4b0e03e
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 56 deletions.
79 changes: 24 additions & 55 deletions core/src/main/java/com/rexcantor64/triton/packetinterceptor/ProtocolLibListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import com.comphenix.protocol.reflect.StructureModifier;
import com.comphenix.protocol.reflect.accessors.Accessors;
import com.comphenix.protocol.reflect.accessors.FieldAccessor;
import com.comphenix.protocol.reflect.accessors.MethodAccessor;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.utility.MinecraftVersion;
import com.comphenix.protocol.wrappers.BlockPosition;
Expand Down Expand Up @@ -69,15 +68,10 @@
@SuppressWarnings({"deprecation"})
public class ProtocolLibListener implements PacketListener, PacketInterceptor {
private final Class<?> CONTAINER_PLAYER_CLASS;
private final Class<?> MERCHANT_RECIPE_LIST_CLASS;
private final MethodAccessor CRAFT_MERCHANT_RECIPE_FROM_BUKKIT_METHOD;
private final MethodAccessor CRAFT_MERCHANT_RECIPE_TO_MINECRAFT_METHOD;
private final Class<BaseComponent[]> BASE_COMPONENT_ARRAY_CLASS = BaseComponent[].class;
private final Class<?> ADVENTURE_COMPONENT_CLASS;
private final FieldAccessor PLAYER_ACTIVE_CONTAINER_FIELD;
private final FieldAccessor PLAYER_INVENTORY_CONTAINER_FIELD;
private final String MERCHANT_RECIPE_SPECIAL_PRICE_FIELD;
private final String MERCHANT_RECIPE_DEMAND_FIELD;
private final String SIGN_NBT_ID;

private final HandlerFunction ASYNC_PASSTHROUGH = asAsync((_packet, _player) -> {
Expand All @@ -96,28 +90,6 @@ public class ProtocolLibListener implements PacketListener, PacketInterceptor {
public ProtocolLibListener(SpigotMLP main, HandlerFunction.HandlerType... allowedTypes) {
this.main = main;
this.allowedTypes = Arrays.asList(allowedTypes);
if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) { // 1.17+
MERCHANT_RECIPE_LIST_CLASS = NMSUtils.getClass("net.minecraft.world.item.trading.MerchantRecipeList");
} else if (MinecraftVersion.VILLAGE_UPDATE.atOrAbove()) { // 1.14+
MERCHANT_RECIPE_LIST_CLASS = NMSUtils.getNMSClass("MerchantRecipeList");
} else {
MERCHANT_RECIPE_LIST_CLASS = null;
}
if (MinecraftVersion.VILLAGE_UPDATE.atOrAbove()) { // 1.14+
val craftMerchantRecipeClass = NMSUtils.getCraftbukkitClass("inventory.CraftMerchantRecipe");
CRAFT_MERCHANT_RECIPE_FROM_BUKKIT_METHOD = Accessors.getMethodAccessor(craftMerchantRecipeClass, "fromBukkit", MerchantRecipe.class);
CRAFT_MERCHANT_RECIPE_TO_MINECRAFT_METHOD = Accessors.getMethodAccessor(craftMerchantRecipeClass, "toMinecraft");
} else {
CRAFT_MERCHANT_RECIPE_FROM_BUKKIT_METHOD = null;
CRAFT_MERCHANT_RECIPE_TO_MINECRAFT_METHOD = null;
}
if (MinecraftVersion.CAVES_CLIFFS_1.atOrAbove()) { // 1.17+
MERCHANT_RECIPE_SPECIAL_PRICE_FIELD = "g";
MERCHANT_RECIPE_DEMAND_FIELD = "h";
} else {
MERCHANT_RECIPE_SPECIAL_PRICE_FIELD = "specialPrice";
MERCHANT_RECIPE_DEMAND_FIELD = "demand";
}
ADVENTURE_COMPONENT_CLASS = NMSUtils.getClassOrNull("net.kyori.adventure.text.Component");
if (MinecraftVersion.EXPLORATION_UPDATE.atOrAbove()) { // 1.11+
SIGN_NBT_ID = "minecraft:sign";
Expand Down Expand Up @@ -200,8 +172,8 @@ private void setupPacketHandlers() {
}
packetHandlers.put(PacketType.Play.Server.WINDOW_ITEMS, asAsync(this::handleWindowItems));
packetHandlers.put(PacketType.Play.Server.SET_SLOT, asAsync(this::handleSetSlot));
if (MinecraftVersion.VILLAGE_UPDATE.atOrAbove()) { // 1.14+
// Villager merchant interface redesign on 1.14
if (MinecraftVersion.CAVES_CLIFFS_2.atOrAbove()) { // 1.18+
// While the villager merchant interface redesign was on 1.14, the Bukkit API only has all fields on 1.18
packetHandlers.put(PacketType.Play.Server.OPEN_WINDOW_MERCHANT, asAsync(this::handleMerchantItems));
}

Expand Down Expand Up @@ -577,37 +549,34 @@ private void handleSetSlot(PacketEvent packet, SpigotLanguagePlayer languagePlay
packet.getPacket().getItemModifier().writeSafely(0, item);
}

@SuppressWarnings({"unchecked"})
private void handleMerchantItems(PacketEvent packet, SpigotLanguagePlayer languagePlayer) {
if (!main.getConf().isItems()) return;

try {
ArrayList<?> recipes = (ArrayList<?>) packet.getPacket()
.getSpecificModifier(MERCHANT_RECIPE_LIST_CLASS).readSafely(0);
ArrayList<Object> newRecipes = (ArrayList<Object>) MERCHANT_RECIPE_LIST_CLASS.newInstance();
for (val recipeObject : recipes) {
val recipe = (MerchantRecipe) NMSUtils.getMethod(recipeObject, "asBukkit");
val originalSpecialPrice = NMSUtils.getDeclaredField(recipeObject, MERCHANT_RECIPE_SPECIAL_PRICE_FIELD);
val originalDemand = NMSUtils.getDeclaredField(recipeObject, MERCHANT_RECIPE_DEMAND_FIELD);

val newRecipe = new MerchantRecipe(ItemStackTranslationUtils.translateItemStack(recipe.getResult()
.clone(), languagePlayer, false), recipe.getUses(), recipe.getMaxUses(), recipe
.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier());

for (val ingredient : recipe.getIngredients()) {
newRecipe.addIngredient(ItemStackTranslationUtils.translateItemStack(ingredient.clone(), languagePlayer, false));
}
val recipes = packet.getPacket().getMerchantRecipeLists().readSafely(0);
val newRecipes = new ArrayList<MerchantRecipe>();

for (val recipe : recipes) {
// Unfortunately this constructor does not exist in older Bukkit versions
// https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/5dca4a4b8455ba1ee8d3e4e36894f6dcc4b04555
val newRecipe = new MerchantRecipe(
ItemStackTranslationUtils.translateItemStack(recipe.getResult().clone(), languagePlayer, false),
recipe.getUses(),
recipe.getMaxUses(),
recipe.hasExperienceReward(),
recipe.getVillagerExperience(),
recipe.getPriceMultiplier(),
recipe.getDemand(),
recipe.getSpecialPrice()
);

Object newCraftRecipe = CRAFT_MERCHANT_RECIPE_FROM_BUKKIT_METHOD.invoke(null, newRecipe);
Object newNMSRecipe = CRAFT_MERCHANT_RECIPE_TO_MINECRAFT_METHOD.invoke(newCraftRecipe);
NMSUtils.setDeclaredField(newNMSRecipe, MERCHANT_RECIPE_SPECIAL_PRICE_FIELD, originalSpecialPrice);
NMSUtils.setDeclaredField(newNMSRecipe, MERCHANT_RECIPE_DEMAND_FIELD, originalDemand);
newRecipes.add(newNMSRecipe);
for (val ingredient : recipe.getIngredients()) {
newRecipe.addIngredient(ItemStackTranslationUtils.translateItemStack(ingredient.clone(), languagePlayer, false));
}
packet.getPacket().getModifier().writeSafely(1, newRecipes);
} catch (IllegalAccessException | InstantiationException e) {
Triton.get().getLogger().logError(e, "Failed to translate merchant items.");

newRecipes.add(newRecipe);
}

packet.getPacket().getMerchantRecipeLists().writeSafely(0, newRecipes);
}

private void handleScoreboardTeam(PacketEvent packet, SpigotLanguagePlayer languagePlayer) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/rexcantor64/triton/utils/ItemStackTranslationUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class ItemStackTranslationUtils {
* @param translateBooks Whether it should translate written books
* @return The translated item stack, which may or may not be the same as the given parameter
*/
@Contract("null, _, _ -> null")
@Contract("null, _, _ -> null; !null, _, _ -> !null")
public static @Nullable ItemStack translateItemStack(@Nullable ItemStack item, @NotNull Localized languagePlayer, boolean translateBooks) {
if (item == null || item.getType() == Material.AIR) {
return item;
Expand Down

0 comments on commit 4b0e03e

Please sign in to comment.