Skip to content

Commit 9cf7fdc

Browse files
DerEchtePilzDerEchtePilz
committed
Correctly place new NMS method in ArgumentNMS classes
1 parent 4caeb94 commit 9cf7fdc

File tree

18 files changed

+90
-99
lines changed

18 files changed

+90
-99
lines changed

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.16.5/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ protected ArgumentNMS(CommandAPIBukkit<?> baseNMS) {
6060
this.baseNMS = (CommandAPIBukkit<CommandListenerWrapper>) baseNMS;
6161
}
6262

63+
@Override
64+
public ArgumentType<?> _ArgumentAdvancement() {
65+
return baseNMS._ArgumentAdvancement();
66+
}
67+
6368
@Override
6469
public ArgumentType<?> _ArgumentAngle() {
6570
return baseNMS._ArgumentAngle();
@@ -175,6 +180,11 @@ public ArgumentType<?> _ArgumentProfile() {
175180
return baseNMS._ArgumentProfile();
176181
}
177182

183+
@Override
184+
public ArgumentType<?> _ArgumentRecipe() {
185+
return baseNMS._ArgumentRecipe();
186+
}
187+
178188
@Override
179189
public ArgumentType<?> _ArgumentRotation() {
180190
return baseNMS._ArgumentRotation();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.16.5/src/main/java/dev/jorel/commandapi/test/MockNMS.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.stream.StreamSupport;
1313

1414
import be.seeseemelk.mockbukkit.help.HelpMapMock;
15-
import com.mojang.brigadier.arguments.ArgumentType;
1615
import dev.jorel.commandapi.*;
1716
import org.bukkit.Bukkit;
1817
import org.bukkit.Color;
@@ -253,16 +252,6 @@ private void registerDefaultRecipes() {
253252
* MockPlatform overrides *
254253
**************************/
255254

256-
@Override
257-
public ArgumentType<?> _ArgumentAdvancement() {
258-
return baseNMS._ArgumentAdvancement();
259-
}
260-
261-
@Override
262-
public ArgumentType<?> _ArgumentRecipe() {
263-
return baseNMS._ArgumentRecipe();
264-
}
265-
266255
@Override
267256
public ItemFactory getItemFactory() {
268257
return CraftItemFactory.instance();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.17/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ protected ArgumentNMS(CommandAPIBukkit<?> baseNMS) {
6060
this.baseNMS = (CommandAPIBukkit<CommandSourceStack>) baseNMS;
6161
}
6262

63+
@Override
64+
public ArgumentType<?> _ArgumentAdvancement() {
65+
return baseNMS._ArgumentAdvancement();
66+
}
67+
6368
@Override
6469
public ArgumentType<?> _ArgumentAngle() {
6570
return baseNMS._ArgumentAngle();
@@ -175,6 +180,11 @@ public ArgumentType<?> _ArgumentProfile() {
175180
return baseNMS._ArgumentProfile();
176181
}
177182

183+
@Override
184+
public ArgumentType<?> _ArgumentRecipe() {
185+
return baseNMS._ArgumentRecipe();
186+
}
187+
178188
@Override
179189
public ArgumentType<?> _ArgumentRotation() {
180190
return baseNMS._ArgumentRotation();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.17/src/main/java/dev/jorel/commandapi/test/MockNMS.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.stream.StreamSupport;
1212

1313
import be.seeseemelk.mockbukkit.help.HelpMapMock;
14-
import com.mojang.brigadier.arguments.ArgumentType;
1514
import dev.jorel.commandapi.*;
1615
import net.minecraft.commands.Commands;
1716
import org.bukkit.Bukkit;
@@ -237,16 +236,6 @@ private void registerDefaultRecipes() {
237236
* MockPlatform overrides *
238237
**************************/
239238

240-
@Override
241-
public ArgumentType<?> _ArgumentAdvancement() {
242-
return baseNMS._ArgumentAdvancement();
243-
}
244-
245-
@Override
246-
public ArgumentType<?> _ArgumentRecipe() {
247-
return baseNMS._ArgumentRecipe();
248-
}
249-
250239
@Override
251240
public ItemFactory getItemFactory() {
252241
return CraftItemFactory.instance();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.18/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ protected ArgumentNMS(CommandAPIBukkit<?> baseNMS) {
6060
this.baseNMS = (CommandAPIBukkit<CommandSourceStack>) baseNMS;
6161
}
6262

63+
@Override
64+
public ArgumentType<?> _ArgumentAdvancement() {
65+
return baseNMS._ArgumentAdvancement();
66+
}
67+
6368
@Override
6469
public ArgumentType<?> _ArgumentAngle() {
6570
return baseNMS._ArgumentAngle();
@@ -175,6 +180,11 @@ public ArgumentType<?> _ArgumentProfile() {
175180
return baseNMS._ArgumentProfile();
176181
}
177182

183+
@Override
184+
public ArgumentType<?> _ArgumentRecipe() {
185+
return baseNMS._ArgumentRecipe();
186+
}
187+
178188
@Override
179189
public ArgumentType<?> _ArgumentRotation() {
180190
return baseNMS._ArgumentRotation();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.18/src/main/java/dev/jorel/commandapi/test/MockNMS.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.stream.StreamSupport;
1313

1414
import be.seeseemelk.mockbukkit.help.HelpMapMock;
15-
import com.mojang.brigadier.arguments.ArgumentType;
1615
import dev.jorel.commandapi.*;
1716
import net.minecraft.commands.Commands;
1817
import org.bukkit.Bukkit;
@@ -254,16 +253,6 @@ private void registerDefaultRecipes() {
254253
* MockPlatform overrides *
255254
**************************/
256255

257-
@Override
258-
public ArgumentType<?> _ArgumentAdvancement() {
259-
return baseNMS._ArgumentAdvancement();
260-
}
261-
262-
@Override
263-
public ArgumentType<?> _ArgumentRecipe() {
264-
return baseNMS._ArgumentRecipe();
265-
}
266-
267256
@Override
268257
public ItemFactory getItemFactory() {
269258
return CraftItemFactory.instance();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.19.2/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ protected ArgumentNMS(CommandAPIBukkit<?> baseNMS) {
7070
this.baseNMS = (CommandAPIBukkit<CommandSourceStack>) baseNMS;
7171
}
7272

73+
@Override
74+
public ArgumentType<?> _ArgumentAdvancement() {
75+
return baseNMS._ArgumentAdvancement();
76+
}
77+
7378
@Override
7479
public ArgumentType<?> _ArgumentAngle() {
7580
return baseNMS._ArgumentAngle();
@@ -206,6 +211,11 @@ public ArgumentType<?> _ArgumentProfile() {
206211
return baseNMS._ArgumentProfile();
207212
}
208213

214+
@Override
215+
public ArgumentType<?> _ArgumentRecipe() {
216+
return baseNMS._ArgumentRecipe();
217+
}
218+
209219
@Override
210220
public ArgumentType<?> _ArgumentRotation() {
211221
return baseNMS._ArgumentRotation();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.19.2/src/main/java/dev/jorel/commandapi/test/MockNMS.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.stream.StreamSupport;
1313

1414
import be.seeseemelk.mockbukkit.help.HelpMapMock;
15-
import com.mojang.brigadier.arguments.ArgumentType;
1615
import dev.jorel.commandapi.*;
1716
import net.minecraft.commands.Commands;
1817
import org.bukkit.Bukkit;
@@ -250,16 +249,6 @@ private void registerDefaultRecipes() {
250249
* MockPlatform overrides *
251250
**************************/
252251

253-
@Override
254-
public ArgumentType<?> _ArgumentAdvancement() {
255-
return baseNMS._ArgumentAdvancement();
256-
}
257-
258-
@Override
259-
public ArgumentType<?> _ArgumentRecipe() {
260-
return baseNMS._ArgumentRecipe();
261-
}
262-
263252
@Override
264253
public ItemFactory getItemFactory() {
265254
return CraftItemFactory.instance();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.19.4/src/main/java/dev/jorel/commandapi/test/ArgumentNMS.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ protected ArgumentNMS(CommandAPIBukkit<?> baseNMS) {
7777
this.baseNMS = (CommandAPIBukkit<CommandSourceStack>) baseNMS;
7878
}
7979

80+
@Override
81+
public ArgumentType<?> _ArgumentAdvancement() {
82+
return baseNMS._ArgumentAdvancement();
83+
}
84+
8085
@Override
8186
public ArgumentType<?> _ArgumentAngle() {
8287
return baseNMS._ArgumentAngle();
@@ -235,6 +240,11 @@ public ArgumentType<?> _ArgumentProfile() {
235240
return baseNMS._ArgumentProfile();
236241
}
237242

243+
@Override
244+
public ArgumentType<?> _ArgumentRecipe() {
245+
return baseNMS._ArgumentRecipe();
246+
}
247+
238248
@Override
239249
public ArgumentType<?> _ArgumentRotation() {
240250
return baseNMS._ArgumentRotation();

‎commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl-1.19.4/src/main/java/dev/jorel/commandapi/test/MockNMS.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.stream.StreamSupport;
1313

1414
import be.seeseemelk.mockbukkit.help.HelpMapMock;
15-
import com.mojang.brigadier.arguments.ArgumentType;
1615
import dev.jorel.commandapi.*;
1716
import net.minecraft.commands.Commands;
1817
import org.bukkit.Bukkit;
@@ -251,16 +250,6 @@ private void registerDefaultRecipes() {
251250
* MockPlatform overrides *
252251
**************************/
253252

254-
@Override
255-
public ArgumentType<?> _ArgumentAdvancement() {
256-
return baseNMS._ArgumentAdvancement();
257-
}
258-
259-
@Override
260-
public ArgumentType<?> _ArgumentRecipe() {
261-
return baseNMS._ArgumentRecipe();
262-
}
263-
264253
@Override
265254
public ItemFactory getItemFactory() {
266255
return CraftItemFactory.instance();

0 commit comments

Comments
 (0)