Skip to content

Commit 4954952

Browse files
committed
Switched font command to singleton serializer, and removed invalid vanilla font example.
1 parent 76dbe0b commit 4954952

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

Common/src/main/java/net/darkhax/bookshelf/impl/BookshelfContentProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.darkhax.bookshelf.Constants;
44
import net.darkhax.bookshelf.api.registry.RegistryDataProvider;
55
import net.darkhax.bookshelf.impl.commands.BookshelfCommands;
6-
import net.darkhax.bookshelf.impl.commands.args.FontArgument;
6+
import net.darkhax.bookshelf.impl.commands.args.sss;
77
import net.darkhax.bookshelf.impl.data.recipes.crafting.ShapedDurabilityRecipe;
88
import net.darkhax.bookshelf.impl.data.recipes.crafting.ShapelessDurabilityRecipe;
99

@@ -14,7 +14,7 @@ public BookshelfContentProvider() {
1414
super(Constants.MOD_ID);
1515

1616
// Command Argument Types
17-
this.commandArguments.add(FontArgument.class, () -> FontArgument.SERIALIZER, "font");
17+
this.commandArguments.add(sss.class, () -> sss.SERIALIZER, "font");
1818

1919
// Command Builders
2020
this.commands.add(BookshelfCommands::new, "commands");

Common/src/main/java/net/darkhax/bookshelf/impl/commands/args/FontArgument.java

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.darkhax.bookshelf.impl.commands.args;
22

3-
import com.google.gson.JsonObject;
43
import com.mojang.brigadier.StringReader;
54
import com.mojang.brigadier.arguments.ArgumentType;
65
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
@@ -9,12 +8,12 @@
98
import com.mojang.brigadier.suggestion.Suggestions;
109
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
1110
import net.darkhax.bookshelf.api.Services;
11+
import net.darkhax.bookshelf.api.commands.args.SingletonArgumentSerializer;
1212
import net.darkhax.bookshelf.api.util.TextHelper;
1313
import net.minecraft.commands.CommandSourceStack;
1414
import net.minecraft.commands.Commands;
1515
import net.minecraft.commands.SharedSuggestionProvider;
1616
import net.minecraft.commands.synchronization.ArgumentSerializer;
17-
import net.minecraft.network.FriendlyByteBuf;
1817
import net.minecraft.resources.ResourceLocation;
1918

2019
import java.util.Collection;
@@ -24,10 +23,10 @@
2423

2524
public class FontArgument implements ArgumentType<ResourceLocation> {
2625

27-
public static final ArgumentSerializer<FontArgument> SERIALIZER = new Serializer();
2826
public static final FontArgument ARGUMENT = new FontArgument();
27+
public static final ArgumentSerializer<FontArgument> SERIALIZER = SingletonArgumentSerializer.of(ARGUMENT);
2928

30-
private static final Collection<ResourceLocation> VANILLA_FONTS = List.of(new ResourceLocation("fake_font"), TextHelper.FONT_DEFAULT, TextHelper.FONT_ALT, TextHelper.FONT_UNIFORM, TextHelper.FONT_ILLAGER);
29+
private static final Collection<ResourceLocation> VANILLA_FONTS = List.of(TextHelper.FONT_DEFAULT, TextHelper.FONT_ALT, TextHelper.FONT_UNIFORM, TextHelper.FONT_ILLAGER);
3130
private static final Collection<String> EXAMPLES = VANILLA_FONTS.stream().map(ResourceLocation::toString).collect(Collectors.toList());
3231

3332
public static ResourceLocation getFont(CommandContext<CommandSourceStack> context) {
@@ -62,23 +61,4 @@ public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> cont
6261

6362
return SharedSuggestionProvider.suggestResource(VANILLA_FONTS, builder);
6463
}
65-
66-
static class Serializer implements ArgumentSerializer<FontArgument> {
67-
68-
@Override
69-
public void serializeToNetwork(FontArgument fontArgument, FriendlyByteBuf friendlyByteBuf) {
70-
71-
}
72-
73-
@Override
74-
public FontArgument deserializeFromNetwork(FriendlyByteBuf friendlyByteBuf) {
75-
76-
return FontArgument.ARGUMENT;
77-
}
78-
79-
@Override
80-
public void serializeToJson(FontArgument fontArgument, JsonObject jsonObject) {
81-
82-
}
83-
}
84-
}
64+
}

0 commit comments

Comments
 (0)