morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

give command changes

Browse Source
This commit is contained in:
Cloudburst
2021-05-03 12:43:14 +02:00
parent fb70169b31
commit 523e8ab544
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/cloudburst/rejects/commands/GiveCommand.java
View File

@@ -14,6 +14,7 @@ import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;
import cloudburst.rejects.arguments.EnumStringArgumentType; import cloudburst.rejects.arguments.EnumStringArgumentType;
import minegame159.meteorclient.systems.commands.Command; import minegame159.meteorclient.systems.commands.Command;
import minegame159.meteorclient.utils.player.ChatUtils; import minegame159.meteorclient.utils.player.ChatUtils;
import minegame159.meteorclient.utils.player.SlotUtils;
import net.minecraft.text.LiteralText; import net.minecraft.text.LiteralText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@@ -56,7 +57,7 @@ public class GiveCommand extends Command {
tag.putString("CustomName", Text.Serializer.toJson(new LiteralText(message))); tag.putString("CustomName", Text.Serializer.toJson(new LiteralText(message)));
tag.put("Pos", listTag); tag.put("Pos", listTag);
stack.putSubTag("EntityTag", tag); stack.putSubTag("EntityTag", tag);
placeStackInHotbar(stack); addItem(stack);
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
}))); })));
@@ -88,7 +89,7 @@ public class GiveCommand extends Command {
tagCompound.put("Explosions", explosionList); tagCompound.put("Explosions", explosionList);
baseCompound.put("Fireworks", tagCompound); baseCompound.put("Fireworks", tagCompound);
firework.setTag(baseCompound); firework.setTag(baseCompound);
placeStackInHotbar(firework); addItem(firework);
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
})); }));
@@ -102,7 +103,7 @@ public class GiveCommand extends Command {
CompoundTag tag = new CompoundTag(); CompoundTag tag = new CompoundTag();
tag.putString("SkullOwner", playerName); tag.putString("SkullOwner", playerName);
itemStack.setTag(tag); itemStack.setTag(tag);
placeStackInHotbar(itemStack); addItem(itemStack);
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
}))); })));
@@ -114,30 +115,18 @@ public class GiveCommand extends Command {
} }
String name = context.getArgument("name", String.class); String name = context.getArgument("name", String.class);
String container = context.getArgument("container", String.class); String container = context.getArgument("container", String.class);
placeStackInHotbar(createPreset(name, container)); addItem(createPreset(name, container));
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
})))); }))));
builder.then(literal("item").then(argument("item", ItemStackArgumentType.itemStack()).executes(context -> {
ItemStackArgument item = ItemStackArgumentType.getItemStackArgument(context, "item");
if (!mc.player.abilities.creativeMode) {
ChatUtils.error("Not In Creative Mode!");
return SINGLE_SUCCESS;
}
placeStackInHotbar(item.createStack(1, false));
return SINGLE_SUCCESS;
})));
} }
private void placeStackInHotbar(ItemStack stack) { private void addItem(ItemStack item) {
for (int i = 0; i < 9; i++) { for(int i = 0; i < 36; i++) {
if (!mc.player.inventory.getStack(i).isEmpty()) continue; ItemStack stack = mc.player.inventory.getStack(SlotUtils.indexToId(i));
if (!stack.isEmpty()) continue;
mc.player.networkHandler.sendPacket(new CreativeInventoryActionC2SPacket(36 + i, stack)); mc.player.networkHandler.sendPacket(new CreativeInventoryActionC2SPacket(SlotUtils.indexToId(i), item));
return; return;
} }
ChatUtils.error("No space in inventory.");
ChatUtils.error("No space in hotbar.");
} }
} }