From 315db0822a37271ff333c6d6044a46a1e7f4f5cc Mon Sep 17 00:00:00 2001
From: melontini <104443436+melontini@users.noreply.github.com>
Date: Tue, 6 Aug 2024 23:30:18 +0700
Subject: [PATCH] 1.21

---
 .../impl/builtin/brigadier/ArithmeticaCommand.java          | 1 -
 .../commander/impl/builtin/events/EntityEvents.java         | 1 -
 .../commander/impl/builtin/events/PlayerEvents.java         | 1 -
 .../commander/impl/builtin/events/ServerLifecycle.java      | 1 -
 .../melontini/commander/impl/builtin/events/ServerTick.java | 1 -
 .../commander/impl/expression/LootContextDataAccessor.java  | 6 +++---
 .../impl/expression/library/ExpressionLibraryLoader.java    | 2 +-
 .../commander/impl/mixin/AdvancementRewardsMixin.java       | 1 -
 .../me/melontini/commander/impl/util/loot/LootUtil.java     | 3 ++-
 .../java/me/melontini/commander/test/ExpressionTest.java    | 1 -
 10 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/me/melontini/commander/impl/builtin/brigadier/ArithmeticaCommand.java b/src/main/java/me/melontini/commander/impl/builtin/brigadier/ArithmeticaCommand.java
index b25a0d1..94ce806 100644
--- a/src/main/java/me/melontini/commander/impl/builtin/brigadier/ArithmeticaCommand.java
+++ b/src/main/java/me/melontini/commander/impl/builtin/brigadier/ArithmeticaCommand.java
@@ -4,7 +4,6 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import java.util.Optional;
 import me.melontini.commander.impl.Commander;
 import me.melontini.commander.impl.expression.CmdEvalException;
 import me.melontini.commander.impl.expression.EvalUtils;
diff --git a/src/main/java/me/melontini/commander/impl/builtin/events/EntityEvents.java b/src/main/java/me/melontini/commander/impl/builtin/events/EntityEvents.java
index 28d4075..8e51792 100644
--- a/src/main/java/me/melontini/commander/impl/builtin/events/EntityEvents.java
+++ b/src/main/java/me/melontini/commander/impl/builtin/events/EntityEvents.java
@@ -6,7 +6,6 @@ import static net.minecraft.loot.context.LootContextParameters.*;
 
 import com.mojang.serialization.Codec;
 import java.util.Objects;
-import java.util.Optional;
 import lombok.experimental.UtilityClass;
 import me.melontini.commander.api.event.EventType;
 import me.melontini.commander.impl.util.loot.LootUtil;
diff --git a/src/main/java/me/melontini/commander/impl/builtin/events/PlayerEvents.java b/src/main/java/me/melontini/commander/impl/builtin/events/PlayerEvents.java
index 9259125..c778a79 100644
--- a/src/main/java/me/melontini/commander/impl/builtin/events/PlayerEvents.java
+++ b/src/main/java/me/melontini/commander/impl/builtin/events/PlayerEvents.java
@@ -4,7 +4,6 @@ import static me.melontini.commander.impl.Commander.id;
 import static net.minecraft.loot.context.LootContextParameters.*;
 
 import com.mojang.serialization.Codec;
-import java.util.Optional;
 import lombok.experimental.UtilityClass;
 import me.melontini.commander.api.event.EventType;
 import me.melontini.commander.api.util.EventExecutors;
diff --git a/src/main/java/me/melontini/commander/impl/builtin/events/ServerLifecycle.java b/src/main/java/me/melontini/commander/impl/builtin/events/ServerLifecycle.java
index 82c5f20..4999d60 100644
--- a/src/main/java/me/melontini/commander/impl/builtin/events/ServerLifecycle.java
+++ b/src/main/java/me/melontini/commander/impl/builtin/events/ServerLifecycle.java
@@ -3,7 +3,6 @@ package me.melontini.commander.impl.builtin.events;
 import static me.melontini.commander.api.util.EventExecutors.runVoid;
 import static me.melontini.commander.impl.Commander.id;
 
-import java.util.Optional;
 import me.melontini.commander.api.event.EventType;
 import me.melontini.commander.impl.util.loot.LootUtil;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
diff --git a/src/main/java/me/melontini/commander/impl/builtin/events/ServerTick.java b/src/main/java/me/melontini/commander/impl/builtin/events/ServerTick.java
index b6f93ad..abb8bff 100644
--- a/src/main/java/me/melontini/commander/impl/builtin/events/ServerTick.java
+++ b/src/main/java/me/melontini/commander/impl/builtin/events/ServerTick.java
@@ -3,7 +3,6 @@ package me.melontini.commander.impl.builtin.events;
 import static me.melontini.commander.api.util.EventExecutors.runVoid;
 import static me.melontini.commander.impl.Commander.id;
 
-import java.util.Optional;
 import lombok.experimental.UtilityClass;
 import me.melontini.commander.api.event.EventType;
 import me.melontini.commander.impl.util.loot.LootUtil;
diff --git a/src/main/java/me/melontini/commander/impl/expression/LootContextDataAccessor.java b/src/main/java/me/melontini/commander/impl/expression/LootContextDataAccessor.java
index e99d6bc..0553ab1 100644
--- a/src/main/java/me/melontini/commander/impl/expression/LootContextDataAccessor.java
+++ b/src/main/java/me/melontini/commander/impl/expression/LootContextDataAccessor.java
@@ -19,9 +19,9 @@ public class LootContextDataAccessor implements DataAccessorIfc {
 
   private static final Map<Identifier, Function<LootContext, Object>> overrides =
       Collections.unmodifiableMap(new Object2ReferenceOpenHashMap<>(Map.of(
-          new Identifier("level"), LootContext::getWorld,
-          new Identifier("luck"), LootContext::getLuck,
-          new Identifier("library"),
+          Identifier.of("level"), LootContext::getWorld,
+          Identifier.of("luck"), LootContext::getLuck,
+          Identifier.of("library"),
               context -> ExpressionLibrary.get(context.getWorld().getServer()))));
   // Cache the way we got the variable.
   // We use the same instance for all expressions, so this can help save some overhead.
diff --git a/src/main/java/me/melontini/commander/impl/expression/library/ExpressionLibraryLoader.java b/src/main/java/me/melontini/commander/impl/expression/library/ExpressionLibraryLoader.java
index 32057d7..ee90c38 100644
--- a/src/main/java/me/melontini/commander/impl/expression/library/ExpressionLibraryLoader.java
+++ b/src/main/java/me/melontini/commander/impl/expression/library/ExpressionLibraryLoader.java
@@ -66,7 +66,7 @@ public class ExpressionLibraryLoader extends JsonCodecDataLoader<ExpressionLibra
   @Override
   public @Nullable EvaluationValue getData(String variable, Token token, EvaluationContext context)
       throws EvaluationException {
-    var expression = ((com.ezylang.evalex.Expression) library.get(new Identifier(variable)));
+    var expression = ((com.ezylang.evalex.Expression) library.get(Identifier.of(variable)));
     if (expression == null) return null;
     return expression.evaluate(context);
   }
diff --git a/src/main/java/me/melontini/commander/impl/mixin/AdvancementRewardsMixin.java b/src/main/java/me/melontini/commander/impl/mixin/AdvancementRewardsMixin.java
index b4ed67d..3742354 100644
--- a/src/main/java/me/melontini/commander/impl/mixin/AdvancementRewardsMixin.java
+++ b/src/main/java/me/melontini/commander/impl/mixin/AdvancementRewardsMixin.java
@@ -6,7 +6,6 @@ import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Function;
 import me.melontini.commander.api.command.Command;
 import me.melontini.commander.api.event.EventContext;
diff --git a/src/main/java/me/melontini/commander/impl/util/loot/LootUtil.java b/src/main/java/me/melontini/commander/impl/util/loot/LootUtil.java
index 289769e..5c926a2 100644
--- a/src/main/java/me/melontini/commander/impl/util/loot/LootUtil.java
+++ b/src/main/java/me/melontini/commander/impl/util/loot/LootUtil.java
@@ -1,11 +1,12 @@
 package me.melontini.commander.impl.util.loot;
 
+import java.util.Optional;
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.loot.context.LootContextParameterSet;
 
 public class LootUtil {
 
   public static LootContext build(LootContextParameterSet parameters) {
-    return new LootContext.Builder(parameters).build(null);
+    return new LootContext.Builder(parameters).build(Optional.empty());
   }
 }
diff --git a/src/testmod/java/me/melontini/commander/test/ExpressionTest.java b/src/testmod/java/me/melontini/commander/test/ExpressionTest.java
index 60d726c..50a0add 100644
--- a/src/testmod/java/me/melontini/commander/test/ExpressionTest.java
+++ b/src/testmod/java/me/melontini/commander/test/ExpressionTest.java
@@ -6,7 +6,6 @@ import com.ezylang.evalex.data.types.StringValue;
 import com.ezylang.evalex.data.types.StructureValue;
 import java.math.BigDecimal;
 import java.util.Map;
-import java.util.Optional;
 import me.melontini.commander.api.expression.Expression;
 import me.melontini.commander.impl.util.loot.LootUtil;
 import me.melontini.handytests.server.ServerTestContext;
-- 
2.51.2