From 5afbf40aa59cdb3ed57f419c138abf31b376f212 Mon Sep 17 00:00:00 2001
From: Jonas Gunz <himself@jonasgunz.de>
Date: Sun, 27 Sep 2020 02:18:59 +0200
Subject: update yarn / loader

---
 src/main/java/re/jag/parquet/commands/Savedata.java               | 2 +-
 src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/main/java/re/jag')

diff --git a/src/main/java/re/jag/parquet/commands/Savedata.java b/src/main/java/re/jag/parquet/commands/Savedata.java
index b0a2622..f9df3cf 100644
--- a/src/main/java/re/jag/parquet/commands/Savedata.java
+++ b/src/main/java/re/jag/parquet/commands/Savedata.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.util.*;
 
 import static net.minecraft.server.command.CommandManager.literal;
-import static net.minecraft.server.command.CommandSource.suggestMatching;
+import static net.minecraft.command.CommandSource.suggestMatching;
 import static net.minecraft.server.command.CommandManager.argument;
 
 import com.google.common.collect.Lists;
diff --git a/src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java b/src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java
index 654c7cd..a5e52a1 100644
--- a/src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java
+++ b/src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java
@@ -1,6 +1,6 @@
 package re.jag.parquet.mixin;
 
-import net.minecraft.entity.passive.AbstractTraderEntity;
+import net.minecraft.entity.passive.MerchantEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.village.TradeOffer;
@@ -10,9 +10,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import re.jag.parquet.CustomStats;
-import re.jag.parquet.Parquet;
 
-@Mixin(AbstractTraderEntity.class)
+@Mixin(MerchantEntity.class)
 public class AbstractTraderEntityMixin {
 	@Shadow
 	PlayerEntity customer;
-- 
cgit v1.2.3