Skip to content

Commit 60f1694

Browse files
committed
remove future code
1 parent a5adfdb commit 60f1694

2 files changed

Lines changed: 8 additions & 39 deletions

File tree

src/main/java/com/robertx22/mine_and_slash/vanilla_mc/commands/giveitems/GiveMap.java

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
import com.mojang.brigadier.arguments.IntegerArgumentType;
55
import com.mojang.brigadier.arguments.StringArgumentType;
66
import com.mojang.brigadier.exceptions.CommandSyntaxException;
7-
import com.robertx22.dungeon_realm.item.DungeonItemMapData;
8-
import com.robertx22.dungeon_realm.item.DungeonItemNbt;
97
import com.robertx22.mine_and_slash.database.registry.ExileDB;
108
import com.robertx22.mine_and_slash.loot.LootInfo;
119
import com.robertx22.mine_and_slash.loot.blueprints.MapBlueprint;
1210
import com.robertx22.mine_and_slash.uncommon.datasaving.StackSaving;
1311
import com.robertx22.mine_and_slash.uncommon.utilityclasses.PlayerUtils;
1412
import com.robertx22.mine_and_slash.vanilla_mc.commands.CommandRefs;
1513
import com.robertx22.mine_and_slash.vanilla_mc.commands.suggestions.GearRaritySuggestions;
16-
import com.robertx22.mine_and_slash.vanilla_mc.commands.suggestions.MapTypeSuggestions;
1714
import net.minecraft.commands.CommandSourceStack;
1815
import net.minecraft.commands.arguments.EntityArgument;
1916
import net.minecraft.world.entity.player.Player;
@@ -31,18 +28,17 @@ public static void register(CommandDispatcher<CommandSourceStack> commandDispatc
3128
literal(CommandRefs.ID)
3229
.then(literal("give").requires(e -> e.hasPermission(2))
3330
.then(literal("map")
34-
.then(argument("type", StringArgumentType.string()).suggests(new MapTypeSuggestions())
35-
.then(argument("target", EntityArgument.player())
36-
.then(argument("level", IntegerArgumentType.integer()).then(argument(
37-
"rarity", StringArgumentType.string()).suggests(new GearRaritySuggestions())
38-
.then(argument("amount", IntegerArgumentType.integer(1, 5000)).executes(e -> execute(
39-
e.getSource(), EntityArgument.getPlayer(e, "target"), IntegerArgumentType.getInteger(e, "level"), StringArgumentType.getString(e, "rarity"),
40-
IntegerArgumentType.getInteger(e, "amount"), StringArgumentType.getString(e, "type")
41-
))))))))));
31+
.then(argument("target", EntityArgument.player())
32+
.then(argument("level", IntegerArgumentType.integer()).then(argument(
33+
"rarity", StringArgumentType.string()).suggests(new GearRaritySuggestions())
34+
.then(argument("amount", IntegerArgumentType.integer(1, 5000)).executes(e -> execute(
35+
e.getSource(), EntityArgument.getPlayer(e, "target"), IntegerArgumentType.getInteger(e, "level"), StringArgumentType.getString(e, "rarity"),
36+
IntegerArgumentType.getInteger(e, "amount")
37+
)))))))));
4238
}
4339

4440
private static int execute(CommandSourceStack commandSource, Player player, int lvl,
45-
String rarity, int amount, String type) {
41+
String rarity, int amount) {
4642

4743

4844
if (Objects.isNull(player)) {
@@ -68,12 +64,6 @@ private static int execute(CommandSourceStack commandSource, Player player, int
6864

6965
StackSaving.MAP.saveTo(mapStack, b.createData());
7066

71-
if (!type.equals("random")) {
72-
DungeonItemMapData map = DungeonItemNbt.DUNGEON_MAP.loadFrom(mapStack);
73-
//map.forced_dungeon_id = type;
74-
DungeonItemNbt.DUNGEON_MAP.saveTo(mapStack, map);
75-
}
76-
7767
PlayerUtils.giveItem(mapStack, player);
7868
}
7969

src/main/java/com/robertx22/mine_and_slash/vanilla_mc/commands/suggestions/MapTypeSuggestions.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)