Skip to content

Commit 2ce189e

Browse files
PatboxPatbox
committed
Update to 1.21.11 and migrate to mojmap
1 parent 97eed34 commit 2ce189e

64 files changed

Lines changed: 897 additions & 909 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.11.+'
2+
id 'fabric-loom' version '1.13.+'
33
id 'maven-publish'
44
id "com.modrinth.minotaur" version "2.+"
55
id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -50,7 +50,7 @@ loom {
5050
dependencies {
5151
// To change the versions see the gradle.properties file
5252
minecraft "com.mojang:minecraft:${project.minecraft_version}"
53-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
53+
mappings loom.officialMojangMappings()
5454
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
5555

5656
// Fabric API. This is technically optional, but you probably want it anyway.

‎gradle.properties‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/use
6-
minecraft_version=1.21.10
7-
yarn_mappings=1.21.10+build.1
8-
loader_version=0.17.2
9-
loom_version=1.11-SNAPSHOT
6+
minecraft_version=1.21.11
7+
loader_version=0.18.2
8+
loom_version=1.13-SNAPSHOT
109

1110
# Fabric API
12-
fabric_version=0.135.0+1.21.10
11+
fabric_version=0.140.0+1.21.11
1312

1413
# Mod Properties
15-
mod_version = 2.8.1+1.21.10
14+
mod_version = 2.9.0+1.21.11
1615
maven_group = eu.pb4
1716
archives_base_name = placeholder-api

‎src/main/java/eu/pb4/placeholders/api/ParserContext.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package eu.pb4.placeholders.api;
22

33
import eu.pb4.placeholders.api.node.parent.DynamicShadowNode;
4-
import net.minecraft.registry.RegistryWrapper;
5-
import net.minecraft.text.Text;
64
import org.jetbrains.annotations.Nullable;
75

86
import java.util.HashMap;
97
import java.util.Map;
108
import java.util.Objects;
119
import java.util.function.Function;
1210
import java.util.function.Supplier;
11+
import net.minecraft.core.HolderLookup;
1312

1413
public final class ParserContext {
1514
private Map<Key<?>, Object> map;
@@ -95,7 +94,7 @@ public Key(String key, @Nullable Class<T> type) {
9594

9695

9796
public static final Key<Boolean> COMPACT_TEXT = new Key<>("compact_text", Boolean.class);
98-
public static final Key<RegistryWrapper.WrapperLookup> WRAPPER_LOOKUP = new Key<>("wrapper_lookup", RegistryWrapper.WrapperLookup.class);
97+
public static final Key<HolderLookup.Provider> WRAPPER_LOOKUP = new Key<>("wrapper_lookup", HolderLookup.Provider.class);
9998
public static final Key<DynamicShadowNode.Transformer> DEFAULT_SHADOW_STYLER = Key.ofNode("default_shadow_styler");
10099

101100
public static <T> Key<T> of(String key, T type) {

‎src/main/java/eu/pb4/placeholders/api/PlaceholderContext.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,51 @@
22

33
import com.mojang.authlib.GameProfile;
44
import eu.pb4.placeholders.impl.placeholder.ViewObjectImpl;
5-
import net.minecraft.entity.Entity;
5+
import net.minecraft.commands.CommandSource;
6+
import net.minecraft.commands.CommandSourceStack;
7+
import net.minecraft.network.chat.Component;
8+
import net.minecraft.resources.Identifier;
69
import net.minecraft.server.MinecraftServer;
7-
import net.minecraft.server.PlayerConfigEntry;
8-
import net.minecraft.server.command.CommandOutput;
9-
import net.minecraft.server.command.ServerCommandSource;
10-
import net.minecraft.server.network.ServerPlayerEntity;
11-
import net.minecraft.server.world.ServerWorld;
12-
import net.minecraft.text.Text;
13-
import net.minecraft.util.Identifier;
14-
import net.minecraft.util.math.Vec2f;
15-
import net.minecraft.util.math.Vec3d;
10+
import net.minecraft.server.level.ServerLevel;
11+
import net.minecraft.server.level.ServerPlayer;
12+
import net.minecraft.server.players.NameAndId;
13+
import net.minecraft.world.entity.Entity;
14+
import net.minecraft.world.phys.Vec2;
15+
import net.minecraft.world.phys.Vec3;
1616
import org.jetbrains.annotations.Contract;
1717
import org.jetbrains.annotations.Nullable;
1818

1919
import java.util.function.Supplier;
2020

2121

2222
public record PlaceholderContext(MinecraftServer server,
23-
Supplier<ServerCommandSource> lazySource,
24-
@Nullable ServerWorld world,
25-
@Nullable ServerPlayerEntity player,
23+
Supplier<CommandSourceStack> lazySource,
24+
@Nullable ServerLevel world,
25+
@Nullable ServerPlayer player,
2626
@Nullable Entity entity,
2727
@Nullable GameProfile gameProfile,
2828
ViewObject view
2929
) {
3030

3131
public PlaceholderContext(MinecraftServer server,
32-
ServerCommandSource source,
33-
@Nullable ServerWorld world,
34-
@Nullable ServerPlayerEntity player,
32+
CommandSourceStack source,
33+
@Nullable ServerLevel world,
34+
@Nullable ServerPlayer player,
3535
@Nullable Entity entity,
3636
@Nullable GameProfile gameProfile,
3737
ViewObject view
3838
) {
3939
this(server, () -> source, world, player, entity, gameProfile, view);
4040
}
4141

42-
public ServerCommandSource source() {
42+
public CommandSourceStack source() {
4343
return this.lazySource.get();
4444
}
4545

4646
public PlaceholderContext(MinecraftServer server,
47-
ServerCommandSource source,
48-
@Nullable ServerWorld world,
49-
@Nullable ServerPlayerEntity player,
47+
CommandSourceStack source,
48+
@Nullable ServerLevel world,
49+
@Nullable ServerPlayer player,
5050
@Nullable Entity entity,
5151
@Nullable GameProfile gameProfile) {
5252
this(server, source, world, player, entity, gameProfile, ViewObject.DEFAULT);
@@ -72,7 +72,7 @@ public boolean hasEntity() {
7272
}
7373

7474
public ParserContext asParserContext() {
75-
return ParserContext.of(KEY, this).with(ParserContext.Key.WRAPPER_LOOKUP, this.server.getRegistryManager());
75+
return ParserContext.of(KEY, this).with(ParserContext.Key.WRAPPER_LOOKUP, this.server.registryAccess());
7676
}
7777

7878
public PlaceholderContext withView(ViewObject view) {
@@ -81,7 +81,7 @@ public PlaceholderContext withView(ViewObject view) {
8181

8282
public void addToContext(ParserContext context) {
8383
context.with(KEY, this);
84-
context.with(ParserContext.Key.WRAPPER_LOOKUP, this.server.getRegistryManager());
84+
context.with(ParserContext.Key.WRAPPER_LOOKUP, this.server.registryAccess());
8585
}
8686

8787

@@ -90,7 +90,7 @@ public static PlaceholderContext of(MinecraftServer server) {
9090
}
9191

9292
public static PlaceholderContext of(MinecraftServer server, ViewObject view) {
93-
return new PlaceholderContext(server, server::getCommandSource, null, null, null, null, view);
93+
return new PlaceholderContext(server, server::createCommandSourceStack, null, null, null, null, view);
9494
}
9595

9696
public static PlaceholderContext of(GameProfile profile, MinecraftServer server) {
@@ -99,41 +99,41 @@ public static PlaceholderContext of(GameProfile profile, MinecraftServer server)
9999

100100
public static PlaceholderContext of(GameProfile profile, MinecraftServer server, ViewObject view) {
101101
var name = profile.name() != null ? profile.name() : profile.id().toString();
102-
return new PlaceholderContext(server, () -> new ServerCommandSource(CommandOutput.DUMMY, Vec3d.ZERO, Vec2f.ZERO, server.getOverworld(), server.getPermissionLevel(new PlayerConfigEntry(profile)), name, Text.literal(name), server, null), null, null, null, profile, view);
102+
return new PlaceholderContext(server, () -> new CommandSourceStack(CommandSource.NULL, Vec3.ZERO, Vec2.ZERO, server.overworld(), server.getProfilePermissions(new NameAndId(profile)), name, Component.literal(name), server, null), null, null, null, profile, view);
103103
}
104104

105-
public static PlaceholderContext of(ServerPlayerEntity player) {
105+
public static PlaceholderContext of(ServerPlayer player) {
106106
return of(player, ViewObject.DEFAULT);
107107
}
108108

109-
public static PlaceholderContext of(ServerPlayerEntity player, ViewObject view) {
110-
return new PlaceholderContext(player.getEntityWorld().getServer(), player::getCommandSource, player.getEntityWorld(), player, player, player.getGameProfile(), view);
109+
public static PlaceholderContext of(ServerPlayer player, ViewObject view) {
110+
return new PlaceholderContext(player.level().getServer(), player::createCommandSourceStack, player.level(), player, player, player.getGameProfile(), view);
111111
}
112112

113-
public static PlaceholderContext of(ServerCommandSource source) {
113+
public static PlaceholderContext of(CommandSourceStack source) {
114114
return of(source, ViewObject.DEFAULT);
115115
}
116116

117-
public static PlaceholderContext of(ServerCommandSource source, ViewObject view) {
118-
return new PlaceholderContext(source.getServer(), source, source.getWorld(), source.getPlayer(), source.getEntity(), source.getPlayer() != null ? source.getPlayer().getGameProfile() : null, view);
117+
public static PlaceholderContext of(CommandSourceStack source, ViewObject view) {
118+
return new PlaceholderContext(source.getServer(), source, source.getLevel(), source.getPlayer(), source.getEntity(), source.getPlayer() != null ? source.getPlayer().getGameProfile() : null, view);
119119
}
120120

121121
public static PlaceholderContext of(Entity entity) {
122122
return of(entity, ViewObject.DEFAULT);
123123
}
124124

125125
public static PlaceholderContext of(Entity entity, ViewObject view) {
126-
if (entity instanceof ServerPlayerEntity player) {
126+
if (entity instanceof ServerPlayer player) {
127127
return of(player, view);
128128
} else {
129-
var world = (ServerWorld) entity.getEntityWorld();
130-
return new PlaceholderContext(world.getServer(), () -> entity.getCommandSource(world), world, null, entity, null, view);
129+
var world = (ServerLevel) entity.level();
130+
return new PlaceholderContext(world.getServer(), () -> entity.createCommandSourceStackForNameResolution(world), world, null, entity, null, view);
131131
}
132132
}
133133

134134

135135
public interface ViewObject {
136-
ViewObject DEFAULT = of(Identifier.of("placeholder_api", "default"));
136+
ViewObject DEFAULT = of(Identifier.fromNamespaceAndPath("placeholder_api", "default"));
137137

138138
static ViewObject of(Identifier identifier) {
139139
return new ViewObjectImpl(identifier);

‎src/main/java/eu/pb4/placeholders/api/PlaceholderResult.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package eu.pb4.placeholders.api;
22

33
import eu.pb4.placeholders.api.parsers.TextParserV1;
4-
import net.minecraft.text.Style;
5-
import net.minecraft.text.Text;
6-
import net.minecraft.util.Formatting;
4+
import net.minecraft.ChatFormatting;
5+
import net.minecraft.network.chat.Component;
6+
import net.minecraft.network.chat.Style;
77

88
public final class PlaceholderResult {
9-
private final Text text;
9+
private final Component text;
1010
private String string;
1111
private final boolean valid;
1212

13-
private PlaceholderResult(Text text, String reason) {
13+
private PlaceholderResult(Component text, String reason) {
1414
if (text != null) {
1515
this.text = text;
1616
this.valid = true;
1717
} else {
18-
this.text = Text.literal("[" + (reason != null ? reason : "Invalid placeholder!") + "]").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(true));
18+
this.text = Component.literal("[" + (reason != null ? reason : "Invalid placeholder!") + "]").setStyle(Style.EMPTY.withColor(ChatFormatting.GRAY).withItalic(true));
1919
this.valid = false;
2020
}
2121
}
@@ -25,7 +25,7 @@ private PlaceholderResult(Text text, String reason) {
2525
*
2626
* @return Text
2727
*/
28-
public Text text() {
28+
public Component text() {
2929
return this.text;
3030
}
3131

@@ -76,7 +76,7 @@ public static PlaceholderResult invalid() {
7676
*
7777
* @return PlaceholderResult
7878
*/
79-
public static PlaceholderResult value(Text text) {
79+
public static PlaceholderResult value(Component text) {
8080
return new PlaceholderResult(text, null);
8181
}
8282

‎src/main/java/eu/pb4/placeholders/api/Placeholders.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import eu.pb4.placeholders.impl.placeholder.builtin.PlayerPlaceholders;
1111
import eu.pb4.placeholders.impl.placeholder.builtin.ServerPlaceholders;
1212
import eu.pb4.placeholders.impl.placeholder.builtin.WorldPlaceholders;
13-
import net.minecraft.text.Text;
14-
import net.minecraft.util.Identifier;
1513
import org.jetbrains.annotations.Nullable;
1614

1715
import java.util.*;
1816
import java.util.regex.Pattern;
17+
import net.minecraft.network.chat.Component;
18+
import net.minecraft.resources.Identifier;
1919

2020
public final class Placeholders {
2121
@Deprecated(forRemoval = true)
@@ -80,11 +80,11 @@ public static ParentNode parseNodes(TextNode node, ParserContext.Key<Placeholder
8080
*
8181
* @return Text
8282
*/
83-
public static Text parseText(Text text, PlaceholderContext context) {
84-
return parseNodes(TextNode.convert(text)).toText(ParserContext.of(PlaceholderContext.KEY, context));
83+
public static Component parseText(Component component, PlaceholderContext context) {
84+
return parseNodes(TextNode.convert(component)).toText(ParserContext.of(PlaceholderContext.KEY, context));
8585
}
8686

87-
public static Text parseText(TextNode textNode, PlaceholderContext context) {
87+
public static Component parseText(TextNode textNode, PlaceholderContext context) {
8888
return parseNodes(textNode).toText(ParserContext.of(PlaceholderContext.KEY, context));
8989
}
9090

@@ -106,7 +106,7 @@ public static ParentNode parseNodes(TextNode node, Pattern pattern, PlaceholderG
106106
return asSingleParent(PatternPlaceholderParser.of(pattern, contextKey, placeholderGetter).parseNodes(node));
107107
}
108108
@Deprecated(forRemoval = true)
109-
public static ParentNode parseNodes(TextNode node, Pattern pattern, Map<String, Text> placeholders) {
109+
public static ParentNode parseNodes(TextNode node, Pattern pattern, Map<String, Component> placeholders) {
110110
return asSingleParent(PatternPlaceholderParser.ofTextMap(pattern, placeholders).parseNodes(node));
111111
}
112112
@Deprecated(forRemoval = true)
@@ -134,43 +134,43 @@ public boolean isContextOptional() {
134134
}).parseNodes(node));
135135
}
136136
@Deprecated(forRemoval = true)
137-
public static Text parseText(Text text, PlaceholderContext context, Pattern pattern) {
137+
public static Component parseText(Component text, PlaceholderContext context, Pattern pattern) {
138138
return parseNodes(TextNode.convert(text), pattern).toText(ParserContext.of(PlaceholderContext.KEY, context));
139139
}
140140
@Deprecated(forRemoval = true)
141-
public static Text parseText(Text text, PlaceholderContext context, Pattern pattern, PlaceholderGetter placeholderGetter) {
141+
public static Component parseText(Component text, PlaceholderContext context, Pattern pattern, PlaceholderGetter placeholderGetter) {
142142
return parseNodes(TextNode.convert(text), pattern, placeholderGetter).toText(ParserContext.of(PlaceholderContext.KEY, context));
143143
}
144144
@Deprecated(forRemoval = true)
145-
public static Text parseText(Text text, Pattern pattern, Map<String, Text> placeholders) {
145+
public static Component parseText(Component text, Pattern pattern, Map<String, Component> placeholders) {
146146
return parseNodes(TextNode.convert(text), pattern, placeholders).toText(ParserContext.of());
147147
}
148148
@Deprecated(forRemoval = true)
149-
public static Text parseText(Text text, Pattern pattern, Set<String> placeholders, ParserContext.Key<PlaceholderGetter> key) {
149+
public static Component parseText(Component text, Pattern pattern, Set<String> placeholders, ParserContext.Key<PlaceholderGetter> key) {
150150
return parseNodes(TextNode.convert(text), pattern, placeholders, key).toText(ParserContext.of());
151151
}
152152

153153
@Deprecated(forRemoval = true)
154-
public static Text parseText(TextNode textNode, PlaceholderContext context, Pattern pattern) {
154+
public static Component parseText(TextNode textNode, PlaceholderContext context, Pattern pattern) {
155155
return parseNodes(textNode, pattern).toText(ParserContext.of(PlaceholderContext.KEY, context));
156156
}
157157

158158
@Deprecated(forRemoval = true)
159-
public static Text parseText(TextNode textNode, PlaceholderContext context, Pattern pattern, PlaceholderGetter placeholderGetter) {
159+
public static Component parseText(TextNode textNode, PlaceholderContext context, Pattern pattern, PlaceholderGetter placeholderGetter) {
160160
return parseNodes(textNode, pattern, placeholderGetter).toText(ParserContext.of(PlaceholderContext.KEY, context));
161161
}
162162

163163
@Deprecated(forRemoval = true)
164-
public static Text parseText(TextNode textNode, PlaceholderContext context, Pattern pattern, Map<String, Text> placeholders) {
164+
public static Component parseText(TextNode textNode, PlaceholderContext context, Pattern pattern, Map<String, Component> placeholders) {
165165
return parseNodes(textNode, pattern, placeholders).toText(ParserContext.of(PlaceholderContext.KEY, context));
166166
}
167167
@Deprecated(forRemoval = true)
168-
public static Text parseText(TextNode textNode, Pattern pattern, Map<String, Text> placeholders) {
168+
public static Component parseText(TextNode textNode, Pattern pattern, Map<String, Component> placeholders) {
169169
return parseNodes(textNode, pattern, placeholders).toText();
170170
}
171171

172172
@Deprecated(forRemoval = true)
173-
public static Text parseText(TextNode textNode, Pattern pattern, Set<String> placeholders, ParserContext.Key<PlaceholderGetter> key) {
173+
public static Component parseText(TextNode textNode, Pattern pattern, Set<String> placeholders, ParserContext.Key<PlaceholderGetter> key) {
174174
return parseNodes(textNode, pattern, placeholders, key).toText();
175175
}
176176

‎src/main/java/eu/pb4/placeholders/api/TextParserUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import eu.pb4.placeholders.api.node.parent.ParentNode;
55
import eu.pb4.placeholders.api.node.parent.ParentTextNode;
66
import eu.pb4.placeholders.api.parsers.TextParserV1;
7-
import net.minecraft.text.Text;
7+
import net.minecraft.network.chat.Component;
88

99

1010
/**
@@ -15,15 +15,15 @@
1515
public final class TextParserUtils {
1616
private TextParserUtils() {}
1717

18-
public static Text formatText(String text) {
18+
public static Component formatText(String text) {
1919
return formatNodes(text).toText(ParserContext.of(), true);
2020
}
2121

22-
public static Text formatTextSafe(String text) {
22+
public static Component formatTextSafe(String text) {
2323
return formatNodesSafe(text).toText(ParserContext.of(), true);
2424
}
2525

26-
public static Text formatText(String text, TextParserV1.TagParserGetter getter) {
26+
public static Component formatText(String text, TextParserV1.TagParserGetter getter) {
2727
return formatNodes(text, getter).toText(null, true);
2828
}
2929

‎src/main/java/eu/pb4/placeholders/api/arguments/SimpleArguments.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package eu.pb4.placeholders.api.arguments;
22

3-
import net.minecraft.util.function.CharPredicate;
43
import org.jetbrains.annotations.Nullable;
54

65
import java.util.ArrayList;
76
import java.util.List;
87
import java.util.Locale;
8+
import net.minecraft.CharPredicate;
99

1010
public class SimpleArguments {
1111
public static boolean isWrapCharacter(char c) {

0 commit comments

Comments
 (0)