mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 23:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
dfsek
2021-05-16 00:35:36 -07:00
parent 5a83eab1fe
commit 95d50a0391
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricUtil.java
-22
View File
@@ -9,10 +9,8 @@ import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.fabric.config.PackFeatureOptionsTemplate; import com.dfsek.terra.fabric.config.PackFeatureOptionsTemplate;
import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor; import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
@@ -33,31 +31,11 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.function.Supplier; import java.util.function.Supplier;
import static net.minecraft.server.command.CommandManager.argument;
import static net.minecraft.server.command.CommandManager.literal;
public final class FabricUtil { public final class FabricUtil {
public static String createBiomeID(ConfigPack pack, String biomeID) { public static String createBiomeID(ConfigPack pack, String biomeID) {
return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT); return pack.getTemplate().getID().toLowerCase() + "/" + biomeID.toLowerCase(Locale.ROOT);
} }
protected static void registerCommands(CommandManager manager) {
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> {
int max = manager.getMaxArgumentDepth();
RequiredArgumentBuilder<ServerCommandSource, String> arg = argument("arg" + (max - 1), StringArgumentType.word());
for(int i = 0; i < max; i++) {
RequiredArgumentBuilder<ServerCommandSource, String> next = argument("arg" + (max - i - 1), StringArgumentType.word());
arg = next.then(FabricUtil.assemble(arg, manager));
}
dispatcher.register(literal("terra").executes(context -> 1).then(FabricUtil.assemble(arg, manager)));
dispatcher.register(literal("te").executes(context -> 1).then(FabricUtil.assemble(arg, manager)));
//dispatcher.register(literal("te").redirect(root));
}
);
}
private static RequiredArgumentBuilder<ServerCommandSource, String> assemble(RequiredArgumentBuilder<ServerCommandSource, String> in, CommandManager manager) { private static RequiredArgumentBuilder<ServerCommandSource, String> assemble(RequiredArgumentBuilder<ServerCommandSource, String> in, CommandManager manager) {
return in.suggests((context, builder) -> { return in.suggests((context, builder) -> {
List<String> args = parseCommand(context.getInput()); List<String> args = parseCommand(context.getInput());
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
-4
View File
@@ -71,9 +71,7 @@ import org.apache.logging.log4j.LogManager;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
@@ -292,8 +290,6 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
} catch(MalformedCommandException e) { } catch(MalformedCommandException e) {
e.printStackTrace(); // TODO do something here even though this should literally never happen e.printStackTrace(); // TODO do something here even though this should literally never happen
} }
FabricUtil.registerCommands(manager);
logger.info("Finished initialization."); logger.info("Finished initialization.");
} }