Redo everything
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.module.action.ActionModules;
|
||||
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
|
||||
import io.github.skippyall.minions.module.instruction.InstructionDisplay;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class AttackModule {
|
||||
public static final InstructionDisplay ATTACK_COMMAND = new InstructionDisplay(
|
||||
Text.translatable("minions.command.attack.name"),
|
||||
Text.translatable("minions.command.attack.description"),
|
||||
Items.DIAMOND_PICKAXE,
|
||||
ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.ATTACK, Text.translatable("minions.command.attack.name"))
|
||||
);
|
||||
|
||||
public static final SimpleModuleItem ATTACK_MODULE = register(
|
||||
Identifier.of(Minions.MOD_ID, "attack_module"),
|
||||
List.of(),
|
||||
List.of(ATTACK_COMMAND),
|
||||
Items.DIAMOND_PICKAXE
|
||||
);
|
||||
|
||||
public static void registerMe() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.module.command.SimpleCommand;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class ChatModule {
|
||||
public static final SimpleModuleItem CHAT_MODULE = register(Identifier.of(Minions.MOD_ID, "chat_module"),
|
||||
new ArrayList<>(), Arrays.asList(
|
||||
new SimpleCommand(Text.of("Message"), Text.of("Send Message in Public Chat"), Items.PAPER, (player, minion) -> minion.getServer().getPlayerManager().broadcast(Text.of("message"), true)),
|
||||
new SimpleCommand(Text.of("Prvt-Message"), Text.of("Send Message to one Person"), Items.TRIAL_KEY, (player, minion) -> {})
|
||||
), Items.PAPER);
|
||||
|
||||
public static void registerMe() {}
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.module.action.ActionModules;
|
||||
import io.github.skippyall.minions.module.command.SimpleCommand;
|
||||
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class InteractModule {
|
||||
public static final SimpleCommand INTERACT_COMMAND = new SimpleCommand(
|
||||
Text.translatable("minions.command.interact.name"),
|
||||
Text.translatable("minions.command.interact.description"),
|
||||
Items.LEVER,
|
||||
ActionModules.detailSelectionExecutor(EntityPlayerActionPack.ActionType.USE, Text.translatable("minions.command.interact.name"))
|
||||
);
|
||||
|
||||
public static final SimpleModuleItem INTERACT_MODULE = register(
|
||||
Identifier.of(Minions.MOD_ID, "interact_module"),
|
||||
List.of(),
|
||||
List.of(INTERACT_COMMAND),
|
||||
Items.LEVER
|
||||
);
|
||||
|
||||
public static void registerMe() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class MobSpawningModule {
|
||||
public static final SimpleModuleItem MOB_SPAWNING_MODULE =
|
||||
register(
|
||||
Identifier.of(Minions.MOD_ID, "mob_spawning_module"),
|
||||
List.of(),
|
||||
List.of(),
|
||||
Items.SPAWNER
|
||||
);
|
||||
|
||||
public static boolean canMinionSpawnMobs(MinionFakePlayer minion) {
|
||||
return minion.getModuleInventory().hasModule(MOB_SPAWNING_MODULE);
|
||||
}
|
||||
|
||||
public static boolean canMinionDespawnMobs(MinionFakePlayer minion) {
|
||||
return minion.getModuleInventory().hasModule(MOB_SPAWNING_MODULE);
|
||||
}
|
||||
|
||||
public static void registerMe() {}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.module.instruction.InstructionDisplay;
|
||||
import net.minecraft.item.ItemConvertible;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ModuleItem extends ItemConvertible {
|
||||
List<InstructionDisplay> getInstructions();
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.MinionItems;
|
||||
import io.github.skippyall.minions.module.command.Command;
|
||||
import io.github.skippyall.minions.module.instruction.InstructionDisplay;
|
||||
import io.github.skippyall.minions.new_program.instruction.Instruction;
|
||||
import io.github.skippyall.minions.program.block.CodeBlock;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.registry.Registries;
|
||||
import net.minecraft.registry.Registry;
|
||||
import net.minecraft.registry.RegistryKey;
|
||||
import net.minecraft.registry.RegistryKeys;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Modules {
|
||||
public static void register() {
|
||||
ChatModule.registerMe();
|
||||
MountModule.registerMe();
|
||||
MoveModule.registerMe();
|
||||
MobSpawningModule.registerMe();
|
||||
InteractModule.registerMe();
|
||||
AttackModule.registerMe();
|
||||
}
|
||||
|
||||
public static SimpleModuleItem register(Identifier id, List<InstructionDisplay> instructions, Item vanillaItem) {
|
||||
return MinionItems.registerItem(id, settings -> new SimpleModuleItem(instructions, settings, vanillaItem));
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.module.command.SimpleCommand;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class MountModule {
|
||||
public static final SimpleCommand MOUNT_COMMAND = new SimpleCommand(
|
||||
Text.of("Mount"),
|
||||
Text.of("Mount the minion to the nearest mountable Entity"),
|
||||
Items.MINECART,
|
||||
(player, minion) -> minion.getMinionActionPack().mount(true)
|
||||
);
|
||||
|
||||
public static final SimpleCommand DISMOUNT_COMMAND = new SimpleCommand(
|
||||
Text.of("Dismount"),
|
||||
Text.of("Dismount the minion"),
|
||||
Items.BARRIER,
|
||||
(player, minion) -> minion.getMinionActionPack().dismount()
|
||||
);
|
||||
|
||||
public static final SimpleModuleItem MOUNT_MODULE =
|
||||
register(Identifier.of(Minions.MOD_ID, "mount_module"),
|
||||
List.of(),
|
||||
List.of(
|
||||
MOUNT_COMMAND,
|
||||
DISMOUNT_COMMAND
|
||||
),
|
||||
Items.MINECART
|
||||
);
|
||||
|
||||
public static void registerMe() {
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import io.github.skippyall.minions.Minions;
|
||||
import io.github.skippyall.minions.module.command.SimpleCommand;
|
||||
import io.github.skippyall.minions.input.TextInput;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static io.github.skippyall.minions.module.Modules.register;
|
||||
|
||||
public class MoveModule {
|
||||
public static final SimpleCommand WALK_COMMAND =
|
||||
new SimpleCommand(
|
||||
Text.literal("Walk"),
|
||||
Text.literal("Walk a specific amount of blocks forward"),
|
||||
Items.IRON_BOOTS,
|
||||
(player, minion) -> TextInput.inputFloat(player, Text.literal("Amount of Blocks"), "1")
|
||||
.thenAccept(minion::moveForward)
|
||||
);
|
||||
|
||||
public static final SimpleCommand TURN_RIGHT_COMMAND =
|
||||
new SimpleCommand(
|
||||
Text.literal("Turn Right"),
|
||||
Text.literal("Turn a specific amount of degrees right"),
|
||||
Items.COMPASS,
|
||||
(player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
|
||||
.thenAccept(degrees -> minion.getMinionActionPack().turn(degrees, 0))
|
||||
);
|
||||
|
||||
public static final SimpleCommand TURN_LEFT_COMMAND =
|
||||
new SimpleCommand(
|
||||
Text.literal("Turn Left"),
|
||||
Text.literal("Turn a specific amount of degrees left"),
|
||||
Items.COMPASS,
|
||||
(player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
|
||||
.thenAccept(degrees -> minion.getMinionActionPack().turn(-degrees, 0))
|
||||
);
|
||||
|
||||
public static final SimpleCommand TURN_UP_COMMAND =
|
||||
new SimpleCommand(
|
||||
Text.literal("Turn Up"),
|
||||
Text.literal("Turn a specific amount of degrees up"),
|
||||
Items.COMPASS,
|
||||
(player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
|
||||
.thenAccept(degrees -> minion.getMinionActionPack().turn(0, -degrees))
|
||||
);
|
||||
|
||||
public static final SimpleCommand TURN_DOWN_COMMAND =
|
||||
new SimpleCommand(
|
||||
Text.literal("Turn Down"),
|
||||
Text.literal("Turn a specific amount of degrees down"),
|
||||
Items.COMPASS,
|
||||
(player, minion) -> TextInput.inputFloat(player, Text.literal("Degrees"), "90")
|
||||
.thenAccept(degrees -> minion.getMinionActionPack().turn(0, degrees))
|
||||
);
|
||||
|
||||
|
||||
|
||||
public static final SimpleModuleItem MOVE_MODULE =
|
||||
register(Identifier.of(Minions.MOD_ID, "move_module"),
|
||||
List.of(),
|
||||
List.of(
|
||||
WALK_COMMAND,
|
||||
TURN_RIGHT_COMMAND,
|
||||
TURN_LEFT_COMMAND,
|
||||
TURN_UP_COMMAND,
|
||||
TURN_DOWN_COMMAND
|
||||
),
|
||||
Items.IRON_BOOTS
|
||||
);
|
||||
|
||||
public static void registerMe() {}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package io.github.skippyall.minions.module;
|
||||
|
||||
import eu.pb4.polymer.core.api.item.SimplePolymerItem;
|
||||
import io.github.skippyall.minions.module.command.Command;
|
||||
import io.github.skippyall.minions.module.instruction.InstructionDisplay;
|
||||
import io.github.skippyall.minions.new_program.instruction.Instruction;
|
||||
import io.github.skippyall.minions.program.block.CodeBlock;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SimpleModuleItem extends SimplePolymerItem implements ModuleItem {
|
||||
private final List<InstructionDisplay> instructions;
|
||||
|
||||
public SimpleModuleItem(List<InstructionDisplay> instructions, Settings settings, Item vanillaItem) {
|
||||
super(settings.maxCount(1), vanillaItem);
|
||||
this.instructions = instructions;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<InstructionDisplay> getInstructions() {
|
||||
return instructions;
|
||||
}
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
package io.github.skippyall.minions.module.action;
|
||||
|
||||
import eu.pb4.sgui.api.elements.GuiElementBuilder;
|
||||
import eu.pb4.sgui.api.gui.SimpleGui;
|
||||
import io.github.skippyall.minions.input.TextInput;
|
||||
import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
|
||||
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
|
||||
import io.github.skippyall.minions.new_program.instruction.Instruction;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.screen.ScreenHandlerType;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ActionModules {
|
||||
public static void executeOnce(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
|
||||
minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.once());
|
||||
}
|
||||
|
||||
public static void executeContinuous(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
|
||||
minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.continuous());
|
||||
}
|
||||
|
||||
public static void executeInterval(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
|
||||
TextInput.inputFloat(player, Text.translatable("minions.command.action.interval.enter"), "3.5").thenAccept(interval -> {
|
||||
int ticks = Math.round(interval * 20);
|
||||
minion.getMinionActionPack().start(actionType, EntityPlayerActionPack.Action.interval(ticks));
|
||||
});
|
||||
}
|
||||
|
||||
public static void executeStop(EntityPlayerActionPack.ActionType actionType, ServerPlayerEntity player, MinionFakePlayer minion) {
|
||||
minion.getMinionActionPack().stop(actionType);
|
||||
}
|
||||
|
||||
public static List<Instruction> actionInstruction(EntityPlayerActionPack.ActionType actionType, Text actionName) {
|
||||
return List.of(
|
||||
|
||||
)
|
||||
|
||||
return (player, minion) -> {
|
||||
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false);
|
||||
gui.setTitle(Text.translatable("minions.command.action.details", actionName));
|
||||
|
||||
gui.setSlot(1, new GuiElementBuilder()
|
||||
.setItem(Items.COMMAND_BLOCK)
|
||||
.setName(Text.translatable("minions.command.action.once", actionName))
|
||||
.setCallback(() -> executeOnce(actionType, player, minion))
|
||||
);
|
||||
gui.setSlot(3, new GuiElementBuilder()
|
||||
.setItem(Items.REPEATING_COMMAND_BLOCK)
|
||||
.setName(Text.translatable("minions.command.action.continuous", actionName))
|
||||
.setCallback(() -> executeContinuous(actionType, player, minion))
|
||||
);
|
||||
gui.setSlot(5, new GuiElementBuilder()
|
||||
.setItem(Items.CHAIN_COMMAND_BLOCK)
|
||||
.setName(Text.translatable("minions.command.action.interval", actionName))
|
||||
.setCallback(() -> executeInterval(actionType, player, minion))
|
||||
);
|
||||
gui.setSlot(4, new GuiElementBuilder()
|
||||
.setItem(Items.BARRIER)
|
||||
.setName(Text.translatable("minions.command.action.stop", actionName))
|
||||
.setCallback(() -> executeStop(actionType, player, minion))
|
||||
);
|
||||
gui.open();
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package io.github.skippyall.minions.module.command;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public interface Command extends CommandExecutor {
|
||||
Text getName();
|
||||
Text getDescription();
|
||||
Item getItemRepresentation();
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package io.github.skippyall.minions.module.command;
|
||||
|
||||
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
|
||||
public interface CommandExecutor {
|
||||
void execute(ServerPlayerEntity player, MinionFakePlayer minion);
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package io.github.skippyall.minions.module.command;
|
||||
|
||||
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public class SimpleCommand implements Command {
|
||||
private final Text name;
|
||||
private final Text description;
|
||||
private final Item itemRepresentation;
|
||||
private final CommandExecutor executor;
|
||||
|
||||
public SimpleCommand(Text name, Text description, Item itemRepresentation, CommandExecutor executor) {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.itemRepresentation = itemRepresentation;
|
||||
this.executor = executor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Text getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Text getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemRepresentation() {
|
||||
return itemRepresentation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(ServerPlayerEntity player, MinionFakePlayer minion) {
|
||||
executor.execute(player, minion);
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package io.github.skippyall.minions.module.instruction;
|
||||
|
||||
import io.github.skippyall.minions.new_program.instruction.Instruction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
public record InstructionDisplay(Text name, Text description, Item itemRepresentation, Instruction instruction) {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user