diff options
Diffstat (limited to 'src/main/java/los/numeros')
3 files changed, 13 insertions, 11 deletions
diff --git a/src/main/java/los/numeros/HidersAndDiggers/Main.java b/src/main/java/los/numeros/HidersAndDiggers/Main.java index 4a28e6d..6ee3cef 100644 --- a/src/main/java/los/numeros/HidersAndDiggers/Main.java +++ b/src/main/java/los/numeros/HidersAndDiggers/Main.java @@ -11,6 +11,7 @@ import los.numeros.GameEngine.Module; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; import net.minecraft.network.MessageType; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.LiteralText; import los.numeros.HidersAndDiggers.modules.*; @@ -19,8 +20,9 @@ public class Main implements Engine { BooleanSupplier running = () -> { return true; }; Module modules[] = new Module[10]; - public Main(MinecraftServer server, int numDiggers) { + public Main(ServerCommandSource source, int numDiggers) { int i; + MinecraftServer server = source.getMinecraftServer(); ServerPlayerEntity[] players, diggers, hiders; Random r = new Random(new Date().getTime()); @@ -59,7 +61,7 @@ public class Main implements Engine { } /* populate the modules */ - modules[0] = new MainModule(diggers, hiders, players); + modules[0] = new MainModule(diggers, hiders, players, source); modules[1] = new GameClockModule(diggers, hiders, server); /* start the game */ diff --git a/src/main/java/los/numeros/HidersAndDiggers/modules/MainModule.java b/src/main/java/los/numeros/HidersAndDiggers/modules/MainModule.java index f941fdf..7513cca 100644 --- a/src/main/java/los/numeros/HidersAndDiggers/modules/MainModule.java +++ b/src/main/java/los/numeros/HidersAndDiggers/modules/MainModule.java @@ -2,25 +2,25 @@ package los.numeros.HidersAndDiggers.modules; import los.numeros.GameEngine.Module; import los.numeros.utils.GiveItem; -import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraft.entity.attribute.EntityAttributeModifier; -import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.GameMode; public class MainModule implements Module { ServerPlayerEntity[] diggers, hidders, players; + ServerCommandSource source; - public MainModule(ServerPlayerEntity[] diggers, ServerPlayerEntity[] hidders, ServerPlayerEntity[] players) { + public MainModule(ServerPlayerEntity[] diggers, ServerPlayerEntity[] hidders, ServerPlayerEntity[] players, ServerCommandSource source) { this.diggers = diggers; this.hidders = hidders; this.players = players; + this.source = source; } public void giveDiggerItems(ServerPlayerEntity[] diggers) { @@ -60,7 +60,6 @@ public class MainModule implements Module { for (ServerPlayerEntity p : hiders) { // equip picaxe on each player p.equip(0, pickaxe); - // give stone x10 GiveItem.giveMultipleItem(p, "minecraft:stone", null, 10); } @@ -85,6 +84,8 @@ public class MainModule implements Module { } giveDiggerItems(diggers); giveHidersItems(hidders); + + ServerWorld world = source.getWorld(); // TODO: FILL AND TP PLAYERS AND CLEAR ALL ITEMS return 0; } diff --git a/src/main/java/los/numeros/command/HidersAndDiggersCommand.java b/src/main/java/los/numeros/command/HidersAndDiggersCommand.java index 8e27655..f54b56d 100644 --- a/src/main/java/los/numeros/command/HidersAndDiggersCommand.java +++ b/src/main/java/los/numeros/command/HidersAndDiggersCommand.java @@ -5,7 +5,6 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import los.numeros.HidersAndDiggers.Main; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; @@ -21,10 +20,10 @@ public class HidersAndDiggersCommand { run(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException { /* get the minecraft server object */ - MinecraftServer server = ctx.getSource().getMinecraftServer(); + ServerCommandSource source = ctx.getSource(); /* pass in the minecraft server object and start it */ - new Main(server, 1); + new Main(source, 1); return 0; } |