diff --git a/.gradle/8.2.1/checksums/checksums.lock b/.gradle/8.2.1/checksums/checksums.lock index 0e1ba0d..7b9893c 100644 Binary files a/.gradle/8.2.1/checksums/checksums.lock and b/.gradle/8.2.1/checksums/checksums.lock differ diff --git a/.gradle/8.2.1/checksums/sha1-checksums.bin b/.gradle/8.2.1/checksums/sha1-checksums.bin index 2b716b4..56f9343 100644 Binary files a/.gradle/8.2.1/checksums/sha1-checksums.bin and b/.gradle/8.2.1/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.2.1/executionHistory/executionHistory.bin b/.gradle/8.2.1/executionHistory/executionHistory.bin index ece5433..5b70e66 100644 Binary files a/.gradle/8.2.1/executionHistory/executionHistory.bin and b/.gradle/8.2.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.2.1/executionHistory/executionHistory.lock b/.gradle/8.2.1/executionHistory/executionHistory.lock index 9095467..b6474ae 100644 Binary files a/.gradle/8.2.1/executionHistory/executionHistory.lock and b/.gradle/8.2.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.2.1/fileHashes/fileHashes.bin b/.gradle/8.2.1/fileHashes/fileHashes.bin index faa6ec4..8baa3f4 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.bin and b/.gradle/8.2.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index 2bf332e..769ec57 100644 Binary files a/.gradle/8.2.1/fileHashes/fileHashes.lock and b/.gradle/8.2.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.2.1/fileHashes/resourceHashesCache.bin b/.gradle/8.2.1/fileHashes/resourceHashesCache.bin index f80be00..e139db2 100644 Binary files a/.gradle/8.2.1/fileHashes/resourceHashesCache.bin and b/.gradle/8.2.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3c39652..5761ada 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 3547456..20da51f 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/src/main/java/com/zivilon/cinder_loe/entity/UtumnoSlaveTrader.java b/src/main/java/com/zivilon/cinder_loe/entity/UtumnoSlaveTrader.java index 4d46daa..4030ac2 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/UtumnoSlaveTrader.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/UtumnoSlaveTrader.java @@ -31,6 +31,8 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.util.StatCollector; import net.minecraft.nbt.NBTTagCompound; +import com.zivilon.cinder_loe.mixins.MixinLOTRTradeEntries; + public class UtumnoSlaveTrader extends LOTREntityMan implements LOTRTradeable.Smith { public static LOTRTradeEntries UTUMNO_SLAVE_BUY; public static LOTRTradeEntries UTUMNO_SLAVE_SELL; @@ -117,7 +119,7 @@ public class UtumnoSlaveTrader extends LOTREntityMan implements LOTRTradeable.Sm new LOTRTradeEntry(new ItemStack(LOTRMod.modTemplate), 20) } ); - + UTUMNO_SLAVE_BUY = ((MixinLOTRTradeEntries)UTUMNO_SLAVE_BUY).vessels(LOTRFoods.NURN_SLAVE_DRINK); UTUMNO_SLAVE_SELL = new LOTRTradeEntries(TradeType.SELL, new LOTRTradeEntry[] { diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRTradeEntries.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRTradeEntries.java new file mode 100644 index 0000000..a056974 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRTradeEntries.java @@ -0,0 +1,14 @@ +package com.zivilon.cinder_loe.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import lotr.common.entity.npc.LOTRTradeEntries; +import lotr.common.LOTRFoods; + +@Mixin(LOTRTradeEntries.class) +public interface MixinLOTRTradeEntries { + + @Invoker("setVessels") + public abstract LOTRTradeEntries vessels(LOTRFoods foods); +} diff --git a/src/main/resources/mixins.cinder_loe.json b/src/main/resources/mixins.cinder_loe.json index aae8119..c277d0a 100644 --- a/src/main/resources/mixins.cinder_loe.json +++ b/src/main/resources/mixins.cinder_loe.json @@ -28,7 +28,8 @@ "MixinLOTRRenderNPCRespawner", "MixinRendererLivingEntity", "MixinLOTRRenderArmorStand", - "MixinLOTREntitySauron" + "MixinLOTREntitySauron", + "MixinLOTRTradeEntries" ], "client": [] }