mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Regenerate patches with relative headers. This should lower conflicts in future PRs.
Convert Forge to use Official mappings. Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive. It is clear that their intent is to allow us to use their names for developing mods like this. See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
This commit is contained in:
1 parent
802298d99d
commit
a95b968c13
832 files changed
+4464
-4373
No files matched your search
@@ -55,8 +55,8 @@ public class CommandEventTest
|
||||
// test: whenever a player uses the /give command, let everyone on the server know
|
||||
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(player -> player.sendMessage(new StringTextComponent(msg), player.getUniqueID()));
|
||||
String msg = source.getTextName() + " used the give command: " + event.getParseResults().getReader().getString();
|
||||
source.getServer().getPlayerList().getPlayers().forEach(player -> player.sendMessage(new StringTextComponent(msg), player.getUUID()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -54,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 LivingEntity && bound.test(((LivingEntity) entity).getHealth()));
|
||||
parser.addPredicate(entity -> entity instanceof LivingEntity && bound.matches(((LivingEntity) entity).getHealth()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -66,25 +66,25 @@ public class EntitySelectorTest
|
||||
@Override
|
||||
public EntitySelector build(EntitySelectorParser parser) throws CommandSyntaxException
|
||||
{
|
||||
parser.setSorter(EntitySelectorParser.RANDOM);
|
||||
parser.setLimit(1);
|
||||
parser.setIncludeNonPlayers(true);
|
||||
parser.addFilter(Entity::isAlive);
|
||||
parser.setSuggestionHandler((builder, consumer) -> builder.suggest(String.valueOf('[')).buildFuture());
|
||||
parser.setOrder(EntitySelectorParser.ORDER_RANDOM);
|
||||
parser.setMaxResults(1);
|
||||
parser.setIncludesEntities(true);
|
||||
parser.addPredicate(Entity::isAlive);
|
||||
parser.setSuggestions((builder, consumer) -> builder.suggest(String.valueOf('[')).buildFuture());
|
||||
if (parser.getReader().canRead() && parser.getReader().peek() == '[')
|
||||
{
|
||||
parser.getReader().skip();
|
||||
parser.setSuggestionHandler((builder, consumer) -> {
|
||||
parser.setSuggestions((builder, consumer) -> {
|
||||
builder.suggest(String.valueOf(']'));
|
||||
EntityOptions.suggestOptions(parser, builder);
|
||||
EntityOptions.suggestNames(parser, builder);
|
||||
return builder.buildFuture();
|
||||
});
|
||||
|
||||
parser.parseArguments();
|
||||
parser.parseOptions();
|
||||
}
|
||||
|
||||
parser.updateFilter();
|
||||
return parser.build();
|
||||
parser.finalizePredicates();
|
||||
return parser.getSelector();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user