Skip to content

Commit a5bca69

Browse files
extclpextclp
committed
Revert getFirst to get(0)
1 parent 7d223e5 commit a5bca69

32 files changed

+205
-206
lines changed

‎src/main/java/carpet/commands/InfoCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void printBlock(List<Component> messages, CommandSourceStack sourc
4949
if (grep != null)
5050
{
5151
Pattern p = Pattern.compile(grep);
52-
Messenger.m(source, messages.getFirst());
52+
Messenger.m(source, messages.get(0));
5353
messages.forEach(line -> {
5454
Matcher m = p.matcher(line.getString());
5555
if (m.find())

‎src/main/java/carpet/logging/HUDController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void update_hud(MinecraftServer server, List<ServerPlayer> force)
9090
case "end" -> Level.END;
9191
default -> player.level().dimension();
9292
};
93-
return new Component[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).getFirst()};
93+
return new Component[]{SpawnReporter.printMobcapsForDimension(server.getLevel(dim), false).get(0)};
9494
});
9595

9696
if(LoggerRegistry.__counter)

‎src/main/java/carpet/script/CarpetScriptHost.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public LiteralArgumentBuilder<CommandSourceStack> addPathToCommand(
175175
}
176176
List<CommandToken> reversedPath = new ArrayList<>(path);
177177
Collections.reverse(reversedPath);
178-
ArgumentBuilder<CommandSourceStack, ?> argChain = reversedPath.getFirst().getCommandNode(this).executes(c -> execute(c, hostName, functionSpec, commandArgs));
178+
ArgumentBuilder<CommandSourceStack, ?> argChain = reversedPath.get(0).getCommandNode(this).executes(c -> execute(c, hostName, functionSpec, commandArgs));
179179
for (int i = 1; i < reversedPath.size(); i++)
180180
{
181181
argChain = reversedPath.get(i).getCommandNode(this).then(argChain);

‎src/main/java/carpet/script/Expression.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public List<String> getExpressionSnippet(Tokenizer.Token token)
135135
String code = this.getCodeString();
136136
List<String> output = new ArrayList<>(getExpressionSnippetLeftContext(token, code, 1));
137137
List<String> context = getExpressionSnippetContext(token, code);
138-
output.add(context.getFirst() + " HERE>> " + context.get(1));
138+
output.add(context.get(0) + " HERE>> " + context.get(1));
139139
output.addAll(getExpressionSnippetRightContext(token, code, 1));
140140
return output;
141141
}
@@ -463,7 +463,7 @@ public void addUnaryFunction(String name, Function<Value, Value> fun)
463463
@Override
464464
public Value eval(List<Value> parameters)
465465
{
466-
return fun.apply(parameters.getFirst());
466+
return fun.apply(parameters.get(0));
467467
}
468468
});
469469
}
@@ -481,7 +481,7 @@ public boolean pure()
481481
@Override
482482
public Value eval(List<Value> parameters)
483483
{
484-
return fun.apply(parameters.getFirst());
484+
return fun.apply(parameters.get(0));
485485
}
486486
});
487487
}
@@ -493,7 +493,7 @@ public void addBinaryFunction(String name, BiFunction<Value, Value, Value> fun)
493493
@Override
494494
public Value eval(List<Value> parameters)
495495
{
496-
return fun.apply(parameters.getFirst(), parameters.get(1));
496+
return fun.apply(parameters.get(0), parameters.get(1));
497497
}
498498
});
499499
}
@@ -1308,10 +1308,10 @@ else if (rop.equals("return"))
13081308
{
13091309
if (!returnNode.args.isEmpty())
13101310
{
1311-
returnNode.op = returnNode.args.getFirst().op;
1312-
returnNode.token = returnNode.args.getFirst().token;
1313-
returnNode.range = returnNode.args.getFirst().range;
1314-
returnNode.args = returnNode.args.getFirst().args;
1311+
returnNode.op = returnNode.args.get(0).op;
1312+
returnNode.token = returnNode.args.get(0).token;
1313+
returnNode.range = returnNode.args.get(0).range;
1314+
returnNode.args = returnNode.args.get(0).args;
13151315
if (scriptsDebugging)
13161316
{
13171317
CarpetScriptServer.LOG.info(" - Removed unnecessary tail return of " + returnNode.token.surface + " from function body at line " + (returnNode.token.lineno + 1) + ", node depth " + indent);
@@ -1454,11 +1454,11 @@ private boolean optimizeTree(Context ctx, ExpressionNode node, Context.Type expe
14541454
}
14551455
else if (args.size() == 1)
14561456
{
1457-
result = ((ILazyOperator) operation).lazyEval(ctx, expectedType, this, node.token, args.getFirst(), null).evalValue(null, expectedType);
1457+
result = ((ILazyOperator) operation).lazyEval(ctx, expectedType, this, node.token, args.get(0), null).evalValue(null, expectedType);
14581458
}
14591459
else // args == 2
14601460
{
1461-
result = ((ILazyOperator) operation).lazyEval(ctx, expectedType, this, node.token, args.getFirst(), args.get(1)).evalValue(null, expectedType);
1461+
result = ((ILazyOperator) operation).lazyEval(ctx, expectedType, this, node.token, args.get(0), args.get(1)).evalValue(null, expectedType);
14621462
}
14631463
node.op = LazyValue.ofConstant(result);
14641464
if (scriptsDebugging)
@@ -1492,14 +1492,14 @@ private LazyValue extractOp(Context ctx, ExpressionNode node, Context.Type expec
14921492
{
14931493
ILazyOperator op = operators.get(token.surface);
14941494
Context.Type requestedType = op.staticType(expectedType);
1495-
LazyValue arg = extractOp(ctx, node.args.getFirst(), requestedType);
1495+
LazyValue arg = extractOp(ctx, node.args.get(0), requestedType);
14961496
return (c, t) -> op.lazyEval(c, t, this, token, arg, null).evalValue(c, t);
14971497
}
14981498
case OPERATOR:
14991499
{
15001500
ILazyOperator op = operators.get(token.surface);
15011501
Context.Type requestedType = op.staticType(expectedType);
1502-
LazyValue arg = extractOp(ctx, node.args.getFirst(), requestedType);
1502+
LazyValue arg = extractOp(ctx, node.args.get(0), requestedType);
15031503
LazyValue arh = extractOp(ctx, node.args.get(1), requestedType);
15041504
return (c, t) -> op.lazyEval(c, t, this, token, arg, arh).evalValue(c, t);
15051505
}

‎src/main/java/carpet/script/api/Auxiliary.java

+27-27
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static void apply(Expression expression)
133133
{
134134
return ListValue.wrap(cc.registry(Registries.SOUND_EVENT).holders().map(soundEventReference -> ValueConversions.of(soundEventReference.key().location())));
135135
}
136-
String rawString = lv.getFirst().getString();
136+
String rawString = lv.get(0).getString();
137137
ResourceLocation soundName = InputValidator.identifierOf(rawString);
138138
Vector3Argument locator = Vector3Argument.findIn(lv, 1);
139139

@@ -181,7 +181,7 @@ public static void apply(Expression expression)
181181
MinecraftServer ms = cc.server();
182182
ServerLevel world = cc.level();
183183
Vector3Argument locator = Vector3Argument.findIn(lv, 1);
184-
String particleName = lv.getFirst().getString();
184+
String particleName = lv.get(0).getString();
185185
int count = 10;
186186
double speed = 0;
187187
float spread = 0.5f;
@@ -226,7 +226,7 @@ public static void apply(Expression expression)
226226
{
227227
CarpetContext cc = (CarpetContext) c;
228228
ServerLevel world = cc.level();
229-
String particleName = lv.getFirst().getString();
229+
String particleName = lv.get(0).getString();
230230
ParticleOptions particle = ShapeDispatcher.getParticleData(particleName, world.registryAccess());
231231
Vector3Argument pos1 = Vector3Argument.findIn(lv, 1);
232232
Vector3Argument pos2 = Vector3Argument.findIn(lv, pos1.offset);
@@ -264,13 +264,13 @@ public static void apply(Expression expression)
264264
));
265265
});
266266

267-
expression.addContextFunction("item_display_name", 1, (c, t, lv) -> new FormattedTextValue(ValueConversions.getItemStackFromValue(lv.getFirst(), false, ((CarpetContext) c).registryAccess()).getHoverName()));
267+
expression.addContextFunction("item_display_name", 1, (c, t, lv) -> new FormattedTextValue(ValueConversions.getItemStackFromValue(lv.get(0), false, ((CarpetContext) c).registryAccess()).getHoverName()));
268268

269269
expression.addContextFunction("particle_box", -1, (c, t, lv) ->
270270
{
271271
CarpetContext cc = (CarpetContext) c;
272272
ServerLevel world = cc.level();
273-
String particleName = lv.getFirst().getString();
273+
String particleName = lv.get(0).getString();
274274
ParticleOptions particle = ShapeDispatcher.getParticleData(particleName, world.registryAccess());
275275
Vector3Argument pos1 = Vector3Argument.findIn(lv, 1);
276276
Vector3Argument pos2 = Vector3Argument.findIn(lv, pos1.offset);
@@ -325,7 +325,7 @@ public static void apply(Expression expression)
325325
List<ShapeDispatcher.ShapeWithConfig> shapes = new ArrayList<>();
326326
if (lv.size() == 1) // bulk
327327
{
328-
Value specLoad = lv.getFirst();
328+
Value specLoad = lv.get(0);
329329
if (!(specLoad instanceof final ListValue spec))
330330
{
331331
throw new InternalExpressionException("In bulk mode - shapes need to be provided as a list of shape specs");
@@ -359,7 +359,7 @@ public static void apply(Expression expression)
359359
Component name;
360360
try
361361
{
362-
Value nameValue = lv.getFirst();
362+
Value nameValue = lv.get(0);
363363
name = nameValue.isNull() ? null : FormattedTextValue.getTextByValue(nameValue);
364364
pointLocator = Vector3Argument.findIn(lv, 1, true, false);
365365
if (lv.size() > pointLocator.offset)
@@ -464,11 +464,11 @@ else if (!interactable && targetBlock == null)
464464
{
465465
return Value.TRUE;
466466
}
467-
if (lv.getFirst().isNull())
467+
if (lv.get(0).isNull())
468468
{
469469
return Value.FALSE;
470470
}
471-
Tag source = ((NBTSerializableValue) (NBTSerializableValue.fromValue(lv.getFirst()))).getTag();
471+
Tag source = ((NBTSerializableValue) (NBTSerializableValue.fromValue(lv.get(0)))).getTag();
472472
Tag match = ((NBTSerializableValue) (NBTSerializableValue.fromValue(lv.get(1)))).getTag();
473473
return BooleanValue.of(NbtUtils.compareNbt(match, source, numParam == 2 || lv.get(2).getBoolean()));
474474
});
@@ -479,7 +479,7 @@ else if (!interactable && targetBlock == null)
479479
{
480480
throw new InternalExpressionException("'encode_nbt' requires 1 or 2 parameters");
481481
}
482-
Value v = lv.getFirst();
482+
Value v = lv.get(0);
483483
boolean force = (argSize > 1) && lv.get(1).getBoolean();
484484
Tag tag;
485485
try
@@ -503,7 +503,7 @@ else if (!interactable && targetBlock == null)
503503
CarpetContext cc = (CarpetContext) c;
504504
CommandSourceStack s = cc.source();
505505
MinecraftServer server = s.getServer();
506-
Value res = lv.getFirst();
506+
Value res = lv.get(0);
507507
List<CommandSourceStack> targets = null;
508508
if (lv.size() == 2)
509509
{
@@ -542,7 +542,7 @@ else if (!interactable && targetBlock == null)
542542
{
543543
throw new InternalExpressionException("'display_title' needs at least a target, type and message, and optionally times");
544544
}
545-
Value pVal = lv.getFirst();
545+
Value pVal = lv.get(0);
546546
if (!(pVal instanceof ListValue))
547547
{
548548
pVal = ListValue.of(pVal);
@@ -671,7 +671,7 @@ else if (!interactable && targetBlock == null)
671671
{
672672
throw new InternalExpressionException("'format' requires at least one component");
673673
}
674-
if (values.getFirst() instanceof final ListValue list && values.size() == 1)
674+
if (values.get(0) instanceof final ListValue list && values.size() == 1)
675675
{
676676
values = list.getItems();
677677
}
@@ -687,7 +687,7 @@ else if (!interactable && targetBlock == null)
687687
List<Component> output = new ArrayList<>();
688688
s.getServer().getCommands().performPrefixedCommand(
689689
new SnoopyCommandSource(s, error, output),
690-
lv.getFirst().getString());
690+
lv.get(0).getString());
691691
return ListValue.of(
692692
NumericValue.ZERO,
693693
ListValue.wrap(output.stream().map(FormattedTextValue::new)),
@@ -726,7 +726,7 @@ else if (!interactable && targetBlock == null)
726726
Value time = new NumericValue(((CarpetContext) c).level().getDayTime());
727727
if (!lv.isEmpty())
728728
{
729-
long newTime = NumericValue.asNumber(lv.getFirst()).getLong();
729+
long newTime = NumericValue.asNumber(lv.get(0)).getLong();
730730
if (newTime < 0)
731731
{
732732
newTime = 0;
@@ -765,7 +765,7 @@ else if (!interactable && targetBlock == null)
765765
Vanilla.MinecraftServer_forceTick(server, () -> System.nanoTime() - scriptServer.tickStart < 50000000L);
766766
if (!lv.isEmpty())
767767
{
768-
long msTotal = NumericValue.asNumber(lv.getFirst()).getLong();
768+
long msTotal = NumericValue.asNumber(lv.get(0)).getLong();
769769
long endExpected = scriptServer.tickStart + msTotal * 1000000L;
770770
long wait = endExpected - System.nanoTime();
771771
if (wait > 0L)
@@ -825,7 +825,7 @@ else if (!interactable && targetBlock == null)
825825
// lazy due to passthrough and context changing ability
826826
expression.addLazyFunction("in_dimension", 2, (c, t, lv) -> {
827827
CommandSourceStack outerSource = ((CarpetContext) c).source();
828-
Value dimensionValue = lv.getFirst().evalValue(c);
828+
Value dimensionValue = lv.get(0).evalValue(c);
829829
Level world = ValueConversions.dimFromValue(dimensionValue, outerSource.getServer());
830830
if (world == outerSource.getLevel())
831831
{
@@ -886,7 +886,7 @@ else if (!interactable && targetBlock == null)
886886
{
887887
throw new InternalExpressionException("'schedule' should have at least 2 arguments, delay and call name");
888888
}
889-
long delay = NumericValue.asNumber(lv.getFirst()).getLong();
889+
long delay = NumericValue.asNumber(lv.get(0)).getLong();
890890

891891
FunctionArgument functionArgument = FunctionArgument.findIn(c, expression.module, lv, 1, false, false);
892892
((CarpetScriptServer)c.host.scriptServer()).events.scheduleCall(
@@ -904,12 +904,12 @@ else if (!interactable && targetBlock == null)
904904

905905
if (lv.size() == 1)
906906
{
907-
res = lv.getFirst();
907+
res = lv.get(0);
908908
CarpetScriptServer.LOG.info(res.getString());
909909
}
910910
else if (lv.size() == 2)
911911
{
912-
String level = lv.getFirst().getString().toLowerCase(Locale.ROOT);
912+
String level = lv.get(0).getString().toLowerCase(Locale.ROOT);
913913
res = lv.get(1);
914914
switch (level)
915915
{
@@ -1018,7 +1018,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
10181018
if (!lv.isEmpty())
10191019
{
10201020
c.host.issueDeprecation("load_app_data(...) with arguments");
1021-
String resource = recognizeResource(lv.getFirst(), false);
1021+
String resource = recognizeResource(lv.get(0), false);
10221022
boolean shared = lv.size() > 1 && lv.get(1).getBoolean();
10231023
fdesc = new FileArgument(resource, FileArgument.Type.NBT, null, false, shared, FileArgument.Reason.READ, c.host);
10241024
}
@@ -1031,7 +1031,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
10311031
{
10321032
throw new InternalExpressionException("'store_app_data' needs NBT tag and an optional file");
10331033
}
1034-
Value val = lv.getFirst();
1034+
Value val = lv.get(0);
10351035
FileArgument fdesc = new FileArgument(null, FileArgument.Type.NBT, null, false, false, FileArgument.Reason.CREATE, c.host);
10361036
if (lv.size() > 1)
10371037
{
@@ -1049,7 +1049,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
10491049
expression.addContextFunction("statistic", 3, (c, t, lv) ->
10501050
{
10511051
CarpetContext cc = (CarpetContext) c;
1052-
ServerPlayer player = EntityValue.getPlayerByValue(cc.server(), lv.getFirst());
1052+
ServerPlayer player = EntityValue.getPlayerByValue(cc.server(), lv.get(0));
10531053
if (player == null)
10541054
{
10551055
return Value.NULL;
@@ -1078,7 +1078,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
10781078
{
10791079
throw new InternalExpressionException("'handle_event' requires at least two arguments, event name, and a callback");
10801080
}
1081-
String event = lv.getFirst().getString();
1081+
String event = lv.get(0).getString();
10821082
FunctionArgument callback = FunctionArgument.findIn(c, expression.module, lv, 1, true, false);
10831083
CarpetScriptHost host = ((CarpetScriptHost) c.host);
10841084
if (callback.function == null)
@@ -1097,7 +1097,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
10971097
}
10981098
CarpetContext cc = (CarpetContext) c;
10991099
CarpetScriptServer server = ((CarpetScriptHost) c.host).scriptServer();
1100-
String eventName = lv.getFirst().getString();
1100+
String eventName = lv.get(0).getString();
11011101
// no such event yet
11021102
if (CarpetEventServer.Event.getEvent(eventName, server) == null)
11031103
{
@@ -1135,7 +1135,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
11351135
{
11361136
return ListValue.wrap(storage.keys().map(NBTSerializableValue::nameFromRegistryId));
11371137
}
1138-
String key = lv.getFirst().getString();
1138+
String key = lv.get(0).getString();
11391139
CompoundTag oldNbt = storage.get(InputValidator.identifierOf(key));
11401140
if (lv.size() == 2)
11411141
{
@@ -1151,7 +1151,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
11511151
// script run create_datapack('foo', {'foo' -> {'bar.json' -> {'c' -> true,'d' -> false,'e' -> {'foo' -> [1,2,3]},'a' -> 'foobar','b' -> 5}}})
11521152
expression.addContextFunction("create_datapack", 2, (c, t, lv) -> {
11531153
CarpetContext cc = (CarpetContext) c;
1154-
String origName = lv.getFirst().getString();
1154+
String origName = lv.get(0).getString();
11551155
String name = InputValidator.validateSimpleString(origName, true);
11561156
MinecraftServer server = cc.server();
11571157
for (String dpName : server.getPackRepository().getAvailableIds())

0 commit comments

Comments
 (0)