aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jonas Gunz <himself@jonasgunz.de> 2020-09-27 02:18:59 +0200
committerGravatar Jonas Gunz <himself@jonasgunz.de> 2020-09-27 02:18:59 +0200
commit5afbf40aa59cdb3ed57f419c138abf31b376f212 (patch)
tree6a5eee5c1d3dba73bcb04703a2377901ad2df2c8
parent2cfaa4a3b271594a3bcc62a6615ca7f99a7db235 (diff)
downloadparquet-5afbf40aa59cdb3ed57f419c138abf31b376f212.tar.gz
update yarn / loader
-rw-r--r--gradle.properties4
-rw-r--r--src/main/java/re/jag/parquet/commands/Savedata.java2
-rw-r--r--src/main/java/re/jag/parquet/mixin/AbstractTraderEntityMixin.java5
3 files changed, 5 insertions, 6 deletions
diff --git a/gradle.properties b/gradle.properties
index c6f6b6c..26f698a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,8 +2,8 @@
org.gradle.jvmargs=-Xmx1G
minecraft_version=1.16.3
-yarn_mappings=1.16.3+build.7
-loader_version=0.9.3+build.207
+yarn_mappings=1.16.3+build.17
+loader_version=0.10.0+build.208
# Mod Properties
mod_version = 0.2.1
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;