Added /whitelist status for admins

- AdminGui Items page added
DasPhiller · Jun 19, 2022 · b04e9f8 · b04e9f8
1 parent 96f8f08
commit b04e9f8
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 39 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
         officialMojangMappings()
     })
     modImplementation("net.fabricmc:fabric-loader:0.14.8")
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.55.3+1.19")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.56.0+1.19")
     modImplementation("net.fabricmc:fabric-language-kotlin:1.8.0+kotlin.1.7.0")
     modImplementation("net.axay:fabrikmc-core:1.8.1")
     modImplementation("net.axay:fabrikmc-commands:1.8.1")

diff --git a/...de/dasphiller/smp/mixin/ExampleMixin.java → ...va/de/dasphiller/smp/mixin/MainMixin.java b/...de/dasphiller/smp/mixin/ExampleMixin.java → ...va/de/dasphiller/smp/mixin/MainMixin.java
@@ -8,7 +8,7 @@
 
 @Mixin(TitleScreen.class)
 // Mixins HAVE to be written in java due to constraints in the mixin system.
-public class ExampleMixin {
+public class MainMixin {
     @Inject(at = @At("HEAD"), method = "init()V")
     private void init(CallbackInfo info) {
         System.out.println("This line is printed by an example mod mixin!");

diff --git a/src/main/java/de/dasphiller/smp/mixin/entity/PlayerConnectionMixin.java b/src/main/java/de/dasphiller/smp/mixin/entity/PlayerConnectionMixin.java
@@ -1,16 +1,10 @@
 package de.dasphiller.smp.mixin.entity;
 
-import de.dasphiller.smp.MainKt;
-import de.dasphiller.smp.mixins.PlayerMixinKt;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.Packet;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
-import org.checkerframework.checker.units.qual.A;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
@@ -27,7 +21,7 @@ public class PlayerConnectionMixin {
     public void onBroadCast(PlayerList instance, Component message, ResourceKey<ChatType> messageType) {
         //just redirecting because I want an empty message here
     }
-    }
+}
 
 
 
diff --git a/src/main/kotlin/de/dasphiller/smp/Main.kt b/src/main/kotlin/de/dasphiller/smp/Main.kt
@@ -2,21 +2,23 @@ package de.dasphiller.smp
 
 import de.dasphiller.smp.commands.adminCommand
 import de.dasphiller.smp.commands.spawnCommand
+import de.dasphiller.smp.commands.whitelistCommand
 import de.dasphiller.smp.listener.ConnectionListener
 import net.axay.fabrik.core.Fabrik
 import net.axay.fabrik.core.text.sendText
 
 fun init() {
-    ConnectionListener
+    ConnectionListener.register()
     adminCommand
     spawnCommand
+    whitelistCommand
 }
 
-fun broadcast(text: String, messageColor: Int = 0xffffff, italic: Boolean = false, bold: Boolean = false) {
+fun broadcast(text: String, color: Int = 0xffffff, italic: Boolean = false, bold: Boolean = false) {
     Fabrik.currentServer?.playerList?.players?.forEach {
         it.sendText {
             text(text) {
-                color = messageColor
+                this.color = color
                 this.italic = italic
                 this.bold = bold
             }

diff --git a/src/main/kotlin/de/dasphiller/smp/commands/WhitelistCommand.kt b/src/main/kotlin/de/dasphiller/smp/commands/WhitelistCommand.kt
@@ -0,0 +1,14 @@
+package de.dasphiller.smp.commands
+
+import net.axay.fabrik.commands.command
+import net.axay.fabrik.core.Fabrik
+import net.axay.fabrik.core.text.sendText
+
+val whitelistCommand = command("whitelist") {
+    requiresPermissionLevel(4)
+    literal("status") {
+        runs {
+            source.player?.sendText(if (Fabrik.currentServer?.playerList?.isUsingWhitelist!!) "true" else "false")
+        }
+    }
+}
diff --git a/src/main/kotlin/de/dasphiller/smp/gui/AdminGui.kt b/src/main/kotlin/de/dasphiller/smp/gui/AdminGui.kt
@@ -1,17 +1,19 @@
 package de.dasphiller.smp.gui
 
-import com.mojang.authlib.GameProfile
 import net.axay.fabrik.core.Fabrik
 import net.axay.fabrik.core.item.itemStack
 import net.axay.fabrik.core.item.setCustomName
 import net.axay.fabrik.core.item.setLore
-import net.axay.fabrik.core.text.literal
 import net.axay.fabrik.core.text.literalText
 import net.axay.fabrik.core.text.sendText
 import net.axay.fabrik.igui.*
-import net.minecraft.network.chat.Component
+import net.axay.fabrik.igui.observable.toGuiList
+import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
-import java.util.*
+
+val items = arrayListOf<ItemStack>(
+    itemStack(Items.LIGHT) { count = 64 },
+)
 
 fun adminGui(): Gui {
     return igui(GuiType.NINE_BY_FIVE, literalText {
@@ -34,26 +36,20 @@ fun adminGui(): Gui {
                     }
                 }
             }.guiIcon, 3)
+            changePageByKey((2 sl 5), itemStack(Items.STRUCTURE_VOID) {
+                setCustomName("Items") {
+                    bold = true
+                    italic = false
+                }
+            }.guiIcon, 1)
         }
         page(3) {
             effectFrom = GuiPage.ChangeEffect.SLIDE_VERTICALLY
             effectTo = GuiPage.ChangeEffect.SLIDE_VERTICALLY
             placeholder(Slots.All, itemStack(Items.GRAY_STAINED_GLASS_PANE) {
                 setCustomName("")
             }.guiIcon)
-            changePageByKey((1 sl 1), itemStack(Items.DARK_OAK_DOOR) {
-                setCustomName {
-                    text("Hauptmenü") {
-                        color = 0x6fa8dc
-                        bold = true
-                        italic = false
-                    }
-                    setLore(listOf(literalText("description") {
-                        italic = false
-                        color = 0xb30003
-                    }))
-                }
-            }.guiIcon, 2)
+            goBack(this)
             button((3 sl 2), itemStack(Items.PAPER) {
                 setCustomName {
                     text("Toggle Whitelist") {
@@ -114,5 +110,36 @@ fun adminGui(): Gui {
                 server?.stopServer()
             }
         }
+        page(1) {
+            effectFrom = GuiPage.ChangeEffect.SLIDE_VERTICALLY
+            effectTo = GuiPage.ChangeEffect.SLIDE_VERTICALLY
+            placeholder(Slots.Border, itemStack(Items.GRAY_STAINED_GLASS_PANE) {
+                setCustomName("")
+            }.guiIcon)
+            val compound = compound(
+                (4 sl 2) rectTo (2 sl 8), items.toGuiList(), iconGenerator = {
+                    itemStack(it.item) {}
+                }, onClick = { event, element ->
+                    event.player.inventory.add(element)
+                }
+            )
+            goBack(this)
+        }
     }
+}
+
+fun goBack(builder: GuiBuilder.PageBuilder) {
+    builder.changePageByKey((1 sl 1), itemStack(Items.DARK_OAK_DOOR) {
+        setCustomName {
+            text("Hauptmenü") {
+                color = 0x6fa8dc
+                bold = true
+                italic = false
+            }
+            setLore(listOf(literalText("description") {
+                italic = false
+                color = 0xb30003
+            }))
+        }
+    }.guiIcon, 2)
 }
diff --git a/src/main/kotlin/de/dasphiller/smp/listener/ConnectionListener.kt b/src/main/kotlin/de/dasphiller/smp/listener/ConnectionListener.kt
@@ -6,15 +6,20 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents
 import net.minecraft.world.level.GameType
 
 object ConnectionListener {
-    init {
+    fun register() {
         ServerPlayConnectionEvents.JOIN.register { serverGamePacketListenerImpl, _, _ ->
             serverGamePacketListenerImpl.player.sendText {
                 text("Willkommen auf dem SMP") {
                     color = 0x8fce00
                 }
             }
             serverGamePacketListenerImpl.player.setGameMode(GameType.SURVIVAL)
-            broadcast("${serverGamePacketListenerImpl.player.displayName.string} hat den Server betreten", 0x8fce00, false, bold = true)
+            broadcast(
+                "${serverGamePacketListenerImpl.player.displayName.string} hat den Server betreten",
+                0x8fce00,
+                false,
+                bold = true
+            )
         }
         ServerPlayConnectionEvents.DISCONNECT.register { handler, _ ->
             broadcast(

diff --git a/src/main/kotlin/de/dasphiller/smp/mixins/PlayerMixinKt.kt b/src/main/kotlin/de/dasphiller/smp/mixins/PlayerMixinKt.kt
@@ -1,17 +1,11 @@
 package de.dasphiller.smp.mixins
 
 import de.dasphiller.smp.broadcast
-import net.minecraft.network.Connection
-import net.minecraft.network.chat.ChatType
-import net.minecraft.network.chat.Component
-import net.minecraft.network.chat.MutableComponent
-import net.minecraft.resources.ResourceKey
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.players.PlayerList
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo
 
 object PlayerMixinKt {
     fun onPlaceNewPlayer(instance: PlayerList) {
         broadcast("Willkommen ")
+
     }
 }
diff --git a/src/main/resources/smp.mixins.json b/src/main/resources/smp.mixins.json
@@ -9,7 +9,7 @@
   "mixins": [
   ],
   "client": [
-    "ExampleMixin"
+    "MainMixin"
   ],
   "injectors": {
     "defaultRequire": 1