Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better name for an OBFHELPER

Browse Source
This commit is contained in:
BillyGalbreath
2020-11-30 03:46:53 -06:00
parent 9ec64966b7
commit 3224b2ba77
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0085-Add-ping-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add /ping command
diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
index 1194f91a5..9141976d1 100644 index 1194f91a51..9141976d1d 100644
--- a/src/main/java/net/minecraft/server/ArgumentEntity.java --- a/src/main/java/net/minecraft/server/ArgumentEntity.java
+++ b/src/main/java/net/minecraft/server/ArgumentEntity.java +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java
@@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType<EntitySelector> { @@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType<EntitySelector> {
@@ -22,7 +22,7 @@ index 1194f91a5..9141976d1 100644
List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource());
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index cabce1a8b..0ad72570f 100644 index cabce1a8ba..1a13eb47e0 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -107,6 +107,7 @@ public class CommandDispatcher { @@ -107,6 +107,7 @@ public class CommandDispatcher {
@@ -37,7 +37,7 @@ index cabce1a8b..0ad72570f 100644
} }
+ public static LiteralArgumentBuilder<CommandListenerWrapper> register(String s) { return a(s); } // Purpur - OBFHELPER + public static LiteralArgumentBuilder<CommandListenerWrapper> literal(String s) { return a(s); } // Purpur - OBFHELPER
public static LiteralArgumentBuilder<CommandListenerWrapper> a(String s) { public static LiteralArgumentBuilder<CommandListenerWrapper> a(String s) {
return LiteralArgumentBuilder.literal(s); return LiteralArgumentBuilder.literal(s);
} }
@@ -55,7 +55,7 @@ index cabce1a8b..0ad72570f 100644
return this.b; return this.b;
} }
diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
index 86f1cfe45..da53af61d 100644 index 86f1cfe454..da53af61d1 100644
--- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
+++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
@@ -189,6 +189,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys @@ -189,6 +189,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
@@ -67,7 +67,7 @@ index 86f1cfe45..da53af61d 100644
if (!(this.k instanceof EntityPlayer)) { if (!(this.k instanceof EntityPlayer)) {
throw CommandListenerWrapper.a.create(); throw CommandListenerWrapper.a.create();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a49807916..10fdbf496 100644 index a49807916d..10fdbf4967 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,10 +133,12 @@ public class PurpurConfig { @@ -133,10 +133,12 @@ public class PurpurConfig {
@@ -85,7 +85,7 @@ index a49807916..10fdbf496 100644
public static String serverModName = "Purpur"; public static String serverModName = "Purpur";
diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java
new file mode 100644 new file mode 100644
index 000000000..c6499ad3c index 0000000000..3d4762c4a1
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@@ -103,7 +103,7 @@ index 000000000..c6499ad3c
+ +
+public class PingCommand { +public class PingCommand {
+ public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) { + public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) {
+ dispatcher.register(CommandDispatcher.register("ping") + dispatcher.register(CommandDispatcher.literal("ping")
+ .requires((listener) -> { + .requires((listener) -> {
+ return listener.hasPermission(2); + return listener.hasPermission(2);
+ }) + })

6
patches/server/0148-Add-demo-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add demo command
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 0ad72570f0..67505129b8 100644 index 1a13eb47e0..ccd0be059f 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -107,6 +107,7 @@ public class CommandDispatcher { @@ -107,6 +107,7 @@ public class CommandDispatcher {
@@ -51,7 +51,7 @@ index f7b7c9e1d2..6379663d75 100644
} }
diff --git a/src/main/java/net/pl3x/purpur/command/DemoCommand.java b/src/main/java/net/pl3x/purpur/command/DemoCommand.java diff --git a/src/main/java/net/pl3x/purpur/command/DemoCommand.java b/src/main/java/net/pl3x/purpur/command/DemoCommand.java
new file mode 100644 new file mode 100644
index 0000000000..c3a92f226e index 0000000000..7640ce18b8
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/DemoCommand.java +++ b/src/main/java/net/pl3x/purpur/command/DemoCommand.java
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
@@ -69,7 +69,7 @@ index 0000000000..c3a92f226e
+ +
+public class DemoCommand { +public class DemoCommand {
+ public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) { + public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) {
+ dispatcher.register(CommandDispatcher.register("demo") + dispatcher.register(CommandDispatcher.literal("demo")
+ .requires((listener) -> { + .requires((listener) -> {
+ return listener.hasPermission(2); + return listener.hasPermission(2);
+ }) + })