mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Fix some compile errors in test classes.
This commit is contained in:
1 parent
40bdde2043
commit
f01b87fac7
22 files changed
+327
-679
No files matched your search
@@ -20,36 +20,19 @@
|
||||
package net.minecraftforge.debug.chat;
|
||||
|
||||
import net.minecraftforge.client.event.ClientChatEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||
import net.minecraftforge.fml.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
|
||||
//@Mod(modid = "clientchateventtest", name = "Client Chat Event Test", version = "0.0.0", clientSideOnly = true)
|
||||
@Mod("client_chat_event_test")
|
||||
@Mod.EventBusSubscriber
|
||||
public class ClientChatEventTest
|
||||
{
|
||||
static final boolean ENABLED = false;
|
||||
|
||||
@EventHandler
|
||||
public void init(FMLInitializationEvent event)
|
||||
{
|
||||
if (ENABLED)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
}
|
||||
|
||||
@net.minecraftforge.eventbus.api.SubscribeEvent
|
||||
public void onPlayerAttemptChat(ClientChatEvent event)
|
||||
@SubscribeEvent
|
||||
public static void onPlayerAttemptChat(ClientChatEvent event)
|
||||
{
|
||||
if (event.getMessage().equals("Cancel"))
|
||||
{
|
||||
event.setCanceled(true);
|
||||
}
|
||||
else if (event.getMessage().equals("Replace this text"))
|
||||
{
|
||||
event.setMessage("Text replaced.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,17 +19,12 @@
|
||||
|
||||
package net.minecraftforge.debug.chat;
|
||||
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.client.ClientCommandHandler;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||
import net.minecraftforge.fml.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.registry.ForgeRegistries;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.GameData;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -37,9 +32,10 @@ import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
//@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true)
|
||||
@Mod("client_command_test")
|
||||
public class ClientCommandTest
|
||||
{
|
||||
/*
|
||||
@EventHandler
|
||||
public void init(FMLInitializationEvent event)
|
||||
{
|
||||
@@ -82,12 +78,13 @@ public class ClientCommandTest
|
||||
{
|
||||
if (args.length > 0)
|
||||
{
|
||||
sender.sendMessage(new TextComponentString("Input: " + Arrays.toString(args)));
|
||||
sender.sendMessage(new StringTextComponent("Input: " + Arrays.toString(args)));
|
||||
}
|
||||
else
|
||||
{
|
||||
sender.sendMessage(new TextComponentString("No arguments."));
|
||||
sender.sendMessage(new StringTextComponent("No arguments."));
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -20,56 +20,50 @@
|
||||
package net.minecraftforge.debug.chat;
|
||||
|
||||
import com.mojang.brigadier.CommandDispatcher;
|
||||
import com.mojang.brigadier.tree.CommandNode;
|
||||
import com.mojang.brigadier.context.ParsedCommandNode;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.CommandSource;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraftforge.event.CommandEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
//@Mod("command_event_test")
|
||||
@Mod("command_event_test")
|
||||
@Mod.EventBusSubscriber
|
||||
public class CommandEventTest
|
||||
{
|
||||
public final Logger LOGGER = LogManager.getLogger();
|
||||
|
||||
public CommandEventTest()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onCommand(CommandEvent event)
|
||||
public static void onCommand(CommandEvent event)
|
||||
{
|
||||
CommandDispatcher<CommandSource> dispatcher = event.getParseResults().getContext().getDispatcher();
|
||||
List<CommandNode<CommandSource>> nodes = new ArrayList<>(event.getParseResults().getContext().getNodes().keySet());
|
||||
List<ParsedCommandNode<CommandSource>> nodes = event.getParseResults().getContext().getNodes();
|
||||
CommandSource source = event.getParseResults().getContext().getSource();
|
||||
|
||||
// test: when the /time command is used with no arguments, automatically add default arguments (/time set day)
|
||||
if (nodes.size() == 1 && nodes.get(0) == dispatcher.getRoot().getChild("time"))
|
||||
if (nodes.size() == 1 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("time"))
|
||||
{
|
||||
event.setParseResults(dispatcher.parse("time set day", source));
|
||||
return;
|
||||
}
|
||||
|
||||
// test: whenever a player uses the /give command, let everyone on the server know
|
||||
if (nodes.size() > 0 && nodes.get(0) == dispatcher.getRoot().getChild("give"))
|
||||
if (nodes.size() > 0 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("give"))
|
||||
{
|
||||
String msg = source.getName() + " used the give command: " + event.getParseResults().getReader().getString();
|
||||
source.getServer().getPlayerList().getPlayers().forEach(entityPlayerMP -> entityPlayerMP.sendMessage(new TextComponentString(msg)));
|
||||
source.getServer().getPlayerList().getPlayers().forEach(PlayerEntityMP -> PlayerEntityMP.sendMessage(new StringTextComponent(msg)));
|
||||
return;
|
||||
}
|
||||
|
||||
// test: when the /kill command is used with no arguments, throw a custom exception
|
||||
if (nodes.size() == 1 && nodes.get(0) == dispatcher.getRoot().getChild("kill"))
|
||||
if (nodes.size() == 1 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("kill"))
|
||||
{
|
||||
event.setException(new CommandException(new TextComponentString("You tried to use the /kill command with no arguments")));
|
||||
event.setException(new CommandException(new StringTextComponent("You tried to use the /kill command with no arguments")));
|
||||
event.setCanceled(true);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016-2019.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.chat;
|
||||
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.FMLServerStartingEvent;
|
||||
import net.minecraftforge.server.command.CommandTreeBase;
|
||||
|
||||
//@Mod(modid = CommandTreeBaseTest.MOD_ID, name = "CommandTreeBaseTest", version = "1.0.0", acceptableRemoteVersions = "*")
|
||||
public class CommandTreeBaseTest
|
||||
{
|
||||
public static final String MOD_ID = "command_tree_base_test";
|
||||
|
||||
@Mod.Instance(CommandTreeBaseTest.MOD_ID)
|
||||
public static CommandTreeBaseTest inst;
|
||||
|
||||
@Mod.EventHandler
|
||||
public void onServerStarted(FMLServerStartingEvent event)
|
||||
{
|
||||
event.registerServerCommand(new CommandTreeTest());
|
||||
}
|
||||
|
||||
public static class CommandTreeTest extends CommandTreeBase
|
||||
{
|
||||
public CommandTreeTest()
|
||||
{
|
||||
addSubcommand(new CommandPing());
|
||||
addSubcommand(new CommandValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "treecommand_test";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage(ICommandSender sender)
|
||||
{
|
||||
return "commands.treecommand_test.usage";
|
||||
}
|
||||
|
||||
public static class CommandPing extends CommandBase
|
||||
{
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "ping";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage(ICommandSender sender)
|
||||
{
|
||||
return "commands.treecommand_test.ping.usage";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException
|
||||
{
|
||||
sender.sendMessage(new TextComponentString("Pong!"));
|
||||
}
|
||||
}
|
||||
|
||||
public static class CommandValue extends CommandTreeBase
|
||||
{
|
||||
private static int value = 0;
|
||||
|
||||
public CommandValue()
|
||||
{
|
||||
addSubcommand(new CommandSet());
|
||||
addSubcommand(new CommandGet());
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "value";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage(ICommandSender sender)
|
||||
{
|
||||
return "commands.treecommand_test.value.usage";
|
||||
}
|
||||
|
||||
public static class CommandSet extends CommandBase
|
||||
{
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "set";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage(ICommandSender sender)
|
||||
{
|
||||
return "commands.treecommand_test.value.set.usage";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException
|
||||
{
|
||||
value = CommandTreeTest.parseInt(args[0]);
|
||||
sender.sendMessage(new TextComponentString("Test value set to: " + value));
|
||||
}
|
||||
}
|
||||
|
||||
public static class CommandGet extends CommandBase
|
||||
{
|
||||
@Override
|
||||
public String getName()
|
||||
{
|
||||
return "get";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage(ICommandSender sender)
|
||||
{
|
||||
return "commands.treecommand_test.value.get.usage";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException
|
||||
{
|
||||
sender.sendMessage(new TextComponentString("Test value: " + value));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,27 +25,26 @@ import net.minecraft.command.arguments.EntityOptions;
|
||||
import net.minecraft.command.arguments.EntitySelector;
|
||||
import net.minecraft.command.arguments.EntitySelectorParser;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraftforge.common.command.EntitySelectorManager;
|
||||
import net.minecraftforge.common.command.IEntitySelectorType;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
|
||||
//@Mod("entity_selector_test")
|
||||
@Mod("entity_selector_test")
|
||||
public class EntitySelectorTest
|
||||
{
|
||||
public EntitySelectorTest()
|
||||
{
|
||||
FMLModLoadingContext.get().getModEventBus().addListener(this::setup);
|
||||
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
|
||||
}
|
||||
|
||||
public void setup(FMLCommonSetupEvent event)
|
||||
{
|
||||
EntityOptions.register("health", this::healthArgument, parser -> true,
|
||||
new TextComponentString("Selects entities based on their current health."));
|
||||
EntityOptions.register("health", this::healthArgument, parser -> true, new StringTextComponent("Selects entities based on their current health."));
|
||||
EntitySelectorManager.register("er", new ExampleCustomSelector());
|
||||
}
|
||||
|
||||
@@ -55,7 +54,7 @@ public class EntitySelectorTest
|
||||
private void healthArgument(EntitySelectorParser parser) throws CommandSyntaxException
|
||||
{
|
||||
MinMaxBounds.FloatBound bound = MinMaxBounds.FloatBound.fromReader(parser.getReader());
|
||||
parser.addFilter(entity -> entity instanceof EntityLivingBase && bound.test(((EntityLivingBase) entity).getHealth()));
|
||||
parser.addFilter(entity -> entity instanceof LivingEntity && bound.test(((LivingEntity) entity).getHealth()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -91,7 +90,7 @@ public class EntitySelectorTest
|
||||
@Override
|
||||
public ITextComponent getSuggestionTooltip()
|
||||
{
|
||||
return new TextComponentString("Example: Selects a random entity");
|
||||
return new StringTextComponent("Example: Selects a random entity");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user