CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from Protonull/remove-custom-merchant

Browse Source 
Remove newly redundant custom merchant
This commit is contained in:
wingzero54
2021-06-07 09:30:19 -05:00
committed by GitHub
parent fad5a623e2 6738fc2d2b
commit fede771f3f
2 changed files with 0 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/entities/merchant/CustomBukkitMerchant.java
View File

@@ -1,61 +0,0 @@
package vg.civcraft.mc.civmodcore.entities.merchant;
import io.papermc.paper.event.player.PlayerTradeEvent;
import java.lang.reflect.Field;
import java.util.logging.Level;
import net.kyori.adventure.text.Component;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchant;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantCustom;
import vg.civcraft.mc.civmodcore.util.CivLogger;
/**
* This is an alternative to {@link Bukkit#createMerchant(Component)} that re-adds
* {@link PlayerTradeEvent} emissions. Just do: {@code new CustomBukkitMerchant(Component)}
*/
public class CustomBukkitMerchant extends CraftMerchantCustom {
private static final CivLogger LOGGER;
private static final Field MERCHANT_FIELD;
static {
LOGGER = CivLogger.getLogger(CustomBukkitMerchant.class);
MERCHANT_FIELD = FieldUtils.getField(CraftMerchant.class, "merchant", true);
FieldUtils.removeFinalModifier(MERCHANT_FIELD);
}
public CustomBukkitMerchant(final Component title) {
super(title);
final var nmsMerchant = new CustomNMSMerchant(this, title);
try {
FieldUtils.writeField(MERCHANT_FIELD, this, nmsMerchant, true);
}
catch (final IllegalAccessException exception) {
LOGGER.log(Level.SEVERE,
"Could not re-set merchant to [" + nmsMerchant + "]",
exception);
}
}
public CustomNMSMerchant getNMSMerchant() {
return (CustomNMSMerchant) super.getMerchant();
}
/**
* Use {@link #getNMSMerchant()} instead. The only reason why this is being kept is because
* the super constructor calls this function and expects this type, not {@link CustomNMSMerchant}.
*/
@Deprecated
@Override
public CraftMerchantCustom.MinecraftMerchant getMerchant() {
return super.getMerchant();
}
@Override
public String toString() {
/** Stolen from {@link Object#toString()} because the super version is garbage */
return getClass().getName() + "@" + Integer.toHexString(hashCode());
}
}

109
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/entities/merchant/CustomNMSMerchant.java
View File

@@ -1,109 +0,0 @@
package vg.civcraft.mc.civmodcore.entities.merchant;
import io.papermc.paper.event.player.PlayerTradeEvent;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.Objects;
import net.kyori.adventure.text.Component;
import net.minecraft.server.v1_16_R3.Entity;
import net.minecraft.server.v1_16_R3.EntityExperienceOrb;
import net.minecraft.server.v1_16_R3.EntityPlayer;
import net.minecraft.server.v1_16_R3.EntityTypes;
import net.minecraft.server.v1_16_R3.EntityVillager;
import net.minecraft.server.v1_16_R3.EntityVillagerAbstract;
import net.minecraft.server.v1_16_R3.EntityVillagerTrader;
import net.minecraft.server.v1_16_R3.MerchantRecipe;
import net.minecraft.server.v1_16_R3.MerchantRecipeList;
import net.minecraft.server.v1_16_R3.World;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVillager;
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantCustom;
import org.bukkit.entity.ExperienceOrb;
public class CustomNMSMerchant extends CraftMerchantCustom.MinecraftMerchant {
private static final Field TRADES_FIELD;
static {
TRADES_FIELD = FieldUtils.getField(CraftMerchantCustom.MinecraftMerchant.class, "trades", true);
FieldUtils.removeFinalModifier(TRADES_FIELD);
}
CustomNMSMerchant(final CustomBukkitMerchant merchant, final Component title) {
super(title);
this.craftMerchant = Objects.requireNonNull(merchant);
}
/**
* @return Returns the raw offers object (which is mutable) via reflection.
*/
public MerchantRecipeList getRawOffers() {
try {
return (MerchantRecipeList) FieldUtils.readField(TRADES_FIELD, this, true);
}
catch (final IllegalAccessException exception) {
throw new RuntimeException(exception);
}
}
/**
* This is based heavily on {@link EntityVillagerAbstract#a(MerchantRecipe)}. This method is called
* by NMS when a trade is being purchased.
*/
@Override
public void a(final MerchantRecipe trade) {
if (getTrader() instanceof EntityPlayer) {
final var trader = (EntityPlayer) getTrader();
final var villager = createDisposableVillager(trader.getWorld());
final var event = new PlayerTradeEvent(
trader.getBukkitEntity(),
villager, // Have to spawn a useless villager because this is @Nonnull
trade.asBukkit(),
true, // reward xp?
true); // should increase uses?
event.callEvent();
killDisposableVillager(villager);
if (event.isCancelled()) {
return;
}
final var eventTrade = event.getTrade();
if (event.willIncreaseTradeUses()) {
eventTrade.setUses(eventTrade.getUses() + 1);
}
if (event.isRewardingExp() && eventTrade.hasExperienceReward()) {
/** Based on {@link EntityVillagerTrader#b(MerchantRecipe)} */
final int xp = 3 + Entity.SHARED_RANDOM.nextInt(4);
final var world = trader.getWorld();
world.addEntity(new EntityExperienceOrb(
world, trader.locX(), trader.locY() + 0.5d, trader.locZ(),
xp, ExperienceOrb.SpawnReason.VILLAGER_TRADE, trader, null));
}
return;
}
super.a(trade);
}
// ------------------------------------------------------------
// Unfortunate but necessary villager management
// ------------------------------------------------------------
private static CraftVillager createDisposableVillager(final World world) {
final var villager = new CraftVillager(world.getServer(),
new EntityVillager(EntityTypes.VILLAGER, world));
villager.setAI(false);
villager.setGravity(false);
villager.setCanPickupItems(false);
villager.setSilent(true);
villager.setVillagerExperience(0);
villager.setInvisible(true);
villager.setRecipes(Collections.emptyList());
return villager;
}
private static void killDisposableVillager(final CraftVillager villager) {
villager.getHandle().dead = true;
villager.getHandle().setHealth(0);
villager.getHandle().shouldBeRemoved = true;
}
}