From b69e2b88798dd2073c3b0c37f3388268f0f8ca16 Mon Sep 17 00:00:00 2001 From: Sakura Ryoko Date: Sun, 29 Dec 2024 13:56:53 -0500 Subject: [PATCH] fix to import org.apache.commons.lang3.tuple.Pair; --- src/main/java/fi/dy/masa/malilib/test/RayTraceUtils.java | 2 +- src/main/java/fi/dy/masa/malilib/test/TestDataSyncer.java | 2 +- src/main/java/fi/dy/masa/malilib/util/nbt/NbtBlockUtils.java | 2 +- src/main/java/fi/dy/masa/malilib/util/nbt/NbtEntityUtils.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/fi/dy/masa/malilib/test/RayTraceUtils.java b/src/main/java/fi/dy/masa/malilib/test/RayTraceUtils.java index 986ce21b06..afa685c33f 100644 --- a/src/main/java/fi/dy/masa/malilib/test/RayTraceUtils.java +++ b/src/main/java/fi/dy/masa/malilib/test/RayTraceUtils.java @@ -4,7 +4,7 @@ import java.util.Optional; import javax.annotation.Nonnull; -import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair; +import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/fi/dy/masa/malilib/test/TestDataSyncer.java b/src/main/java/fi/dy/masa/malilib/test/TestDataSyncer.java index a3af083eea..ef78a2c062 100644 --- a/src/main/java/fi/dy/masa/malilib/test/TestDataSyncer.java +++ b/src/main/java/fi/dy/masa/malilib/test/TestDataSyncer.java @@ -1,6 +1,6 @@ package fi.dy.masa.malilib.test; -import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair; +import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtBlockUtils.java b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtBlockUtils.java index 221c04e26b..ddaff07416 100644 --- a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtBlockUtils.java +++ b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtBlockUtils.java @@ -7,8 +7,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair; import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; +import org.apache.commons.lang3.tuple.Pair; import net.minecraft.block.entity.BeehiveBlockEntity; import net.minecraft.block.entity.BlockEntityType; diff --git a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtEntityUtils.java b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtEntityUtils.java index 3d83ad4018..8ada551567 100644 --- a/src/main/java/fi/dy/masa/malilib/util/nbt/NbtEntityUtils.java +++ b/src/main/java/fi/dy/masa/malilib/util/nbt/NbtEntityUtils.java @@ -6,7 +6,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.collect.Maps; -import com.llamalad7.mixinextras.lib.apache.commons.tuple.Pair; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; import com.mojang.datafixers.util.Either;