feat: bring forwards 1.18.2 changes (Starting items, class names, player)

Author: MichaelHillcox

Diff for: CHANGELOG.md

@@ -1,7 +1,40 @@
 # Kube Utils Changelog
 
-## [1.0.0]
+## [1.0.1]
+
+> This is features ported up for 0.1.4 (1.18.2 update)
 
 ### Added
 
-- Ported 1.19.2
+- A new `KuEvents.playerStarterItems` event that, once used and successfully gave items, will stop running
+    - You can define an item and equipment slot (For things like armor) too
+      ```javascript
+      KuEvents.playerStarterItems(event => {
+          // Item.of is optional here 
+          event.addItems("5x minecraft:gold_ingot", Item.of("2x minecraft:grass_block"))
+      
+          // Valid options are part of the EquipmentSlot Enum
+          event.addEquipmentItem("chest", "minecraft:golden_chestplate")
+          event.addEquipmentItem("offhand", "minecraft:stone")
+      })
+      ```
+- A new `Ku.Player` class that brings some helpful methods
+    - `showActionBar(text: string, color?: Color = Color.WHITE, bold = false, italic = false)`
+        - Uses the built-in client action bar to display a message. This is already supported through the player class but this method allows for less boilerplate and stable code ports
+    - `showActionBarComponent(component: Component)`
+        - Mostly the same as the above but gives you access to use a JS Object as your component which might look a something like this
+          ```javascript
+          const player = Ku.Player(event.player);
+          player.showActionBarComponent({
+             text: "Hello",
+             bold: true
+          })
+          ```
+    - `clearStarterItemsFlag`
+        - This method simply reset the flag for the `ku.player.starter-items` meaning on the next login, the player will be given the items once again
+    - `isClientSide`
+        - Lets you know if the client being wrapped is client side. This was mostly a helper for my code but it could be helpful
+
+### Changed
+
+- Renamed the internal binding classes to be suffixed with Ku so they're visually different from vanilla and KubeJS

Diff for: gradle.properties

@@ -6,7 +6,7 @@ loom.platform=forge
 minecraft_version=1.19.2
 forge_version=1.19.2-43.2.3
 
-mod_version=1.0.0
+mod_version=1.0.1
 maven_group=pro.mikey.mods
 archives_base_name=kube-utils
 mod_id=kubeutils

Diff for: src/main/java/pro/mikey/kubeutils/KubeUtils.java

@@ -1,15 +1,24 @@
 package pro.mikey.kubeutils;
 
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.mikey.kubeutils.events.OnPlayerLoginEvent;
 
 @Mod(KubeUtils.MOD_ID)
 public class KubeUtils {
     public static final String MOD_ID = "kubeutils";
     public static final Logger LOGGER = LogManager.getLogger();
 
-    public KubeUtils() {}
+
+    public KubeUtils() {
+        this.registerEvents();
+    }
+
+    private void registerEvents() {
+        MinecraftForge.EVENT_BUS.register(new OnPlayerLoginEvent());
+    }
 
     public static String getId() {
         return MOD_ID;

Diff for: src/main/java/pro/mikey/kubeutils/events/KuEvents.java

@@ -0,0 +1,17 @@
+package pro.mikey.kubeutils.events;
+
+import pro.mikey.kubeutils.utils.Utils;
+
+public enum KuEvents {
+    PLAYER_STARTER_ITEMS("player.starter-items");
+
+    private final String id;
+
+    KuEvents(String id) {
+        this.id = "%s.%s".formatted(Utils.PREFIX, id);
+    }
+
+    public String id() {
+        return id;
+    }
+}

Diff for: src/main/java/pro/mikey/kubeutils/events/OnPlayerLoginEvent.java

@@ -0,0 +1,17 @@
+package pro.mikey.kubeutils.events;
+
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import pro.mikey.kubeutils.kubejs.events.KuEventsGroup;
+import pro.mikey.kubeutils.kubejs.events.PlayerStarterItems;
+
+// NOTE: Maybe move this to a single class of events?
+public class OnPlayerLoginEvent {
+
+    @SubscribeEvent
+    void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
+        if (!event.getEntity().kjs$getPersistentData().getBoolean(PlayerStarterItems.STARTER_ITEMS_GIVEN_FLAG)) {
+            KuEventsGroup.PLAYER_STARTING_ITEMS.post(new PlayerStarterItems(event.getEntity()));
+        }
+    }
+}

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/BaseBindings.java

@@ -4,9 +4,10 @@
 import pro.mikey.kubeutils.kubejs.modules.*;
 
 public interface BaseBindings {
-    Fluids Fluids = new Fluids();
-    Utils Utils = new Utils();
+    FluidsKu Fluids = new FluidsKu();
+    UtilsKu Utils = new UtilsKu();
     StreamsHelper Streams = new StreamsHelper();
-    ListActions Lists = new ListActions();
-    ClassWrapper<LevelUtils> Level = new ClassWrapper<>(LevelUtils.class);
+    ListsKu Lists = new ListsKu();
+    ClassWrapper<LevelKu> Level = new ClassWrapper<>(LevelKu.class);
+    ClassWrapper<PlayerKu> Player = new ClassWrapper<>(PlayerKu.class);
 }

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/KubeUtilsPlugin.java

@@ -2,10 +2,26 @@
 
 import dev.latvian.mods.kubejs.KubeJSPlugin;
 import dev.latvian.mods.kubejs.script.BindingsEvent;
+import dev.latvian.mods.kubejs.script.ScriptType;
+import dev.latvian.mods.kubejs.util.ClassFilter;
+import pro.mikey.kubeutils.kubejs.events.KuEventsGroup;
+import pro.mikey.kubeutils.utils.Utils;
 
 public class KubeUtilsPlugin extends KubeJSPlugin {
     @Override
     public void registerBindings(BindingsEvent event) {
         event.add("Ku", BaseBindings.class);
     }
+
+    @Override
+    public void registerEvents() {
+        KuEventsGroup.GROUP.register();
+    }
+
+    @Override
+    public void registerClasses(ScriptType type, ClassFilter filter) {
+        filter.deny(Utils.class);
+        filter.deny(BaseBindings.class);
+        filter.deny(KubeUtilsPlugin.class);
+    }
 }

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/events/KuEventsGroup.java

@@ -0,0 +1,9 @@
+package pro.mikey.kubeutils.kubejs.events;
+
+import dev.latvian.mods.kubejs.event.EventGroup;
+import dev.latvian.mods.kubejs.event.EventHandler;
+
+public class KuEventsGroup {
+    public static final EventGroup GROUP = EventGroup.of("KuEvents");
+    public static final EventHandler PLAYER_STARTING_ITEMS = GROUP.server("playerStarterItems", () -> PlayerStarterItems.class);
+}

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/events/PlayerStarterItems.java

@@ -0,0 +1,91 @@
+package pro.mikey.kubeutils.kubejs.events;
+
+import dev.latvian.mods.kubejs.item.ItemHandlerUtils;
+import dev.latvian.mods.kubejs.player.PlayerEventJS;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import pro.mikey.kubeutils.events.KuEvents;
+import pro.mikey.kubeutils.kubejs.modules.PlayerKu;
+import pro.mikey.kubeutils.utils.Utils;
+import pro.mikey.kubeutils.utils.annotations.KuEvent;
+
+import java.util.*;
+
+/**
+ * Custom event fired when the player logins in and does not have the {@link PlayerStarterItems#STARTER_ITEMS_GIVEN_FLAG}
+ * flag enabled. You can reset this flag at any point using {@link PlayerKu#clearStarterItemsFlag()}
+ *
+ * To add items, simply call the event and use the `addItems` method.
+ * <p>
+ * <code>
+ * // 1.18
+ * // Item.of is optional here
+ * KuEvents.playerStarterItems(event => {
+ *     event.addItems("5x minecraft:gold_ingot", Item.of("2x minecraft:grass_block"))
+ * <p>
+ *     event.addEquipmentItem("chest", "minecraft:golden_chestplate")
+ *     event.addEquipmentItem("offhand", "minecraft:stone")
+ * })
+ * </code
+ */
+@KuEvent(KuEvents.PLAYER_STARTER_ITEMS)
+public class PlayerStarterItems extends PlayerEventJS {
+    public static final String STARTER_ITEMS_GIVEN_FLAG = Utils.kuIdStorage("sig");
+
+    private final Player player;
+    private final List<ItemStack> items = new ArrayList<>();
+    private final Map<EquipmentSlot, ItemStack> armorItems = new HashMap<>();
+
+    public PlayerStarterItems(Player player) {
+        this.player = player;
+    }
+
+    public void addItems(ItemStack... items) {
+        this.items.addAll(List.of(items));
+    }
+
+    public void addEquipmentItem(String equipmentSlot, ItemStack item) {
+        var slot = Arrays.stream(EquipmentSlot.values())
+                .filter(e -> e.getName().equalsIgnoreCase(equipmentSlot))
+                .findFirst()
+                .orElse(EquipmentSlot.CHEST);
+
+        this.armorItems.put(slot, item);
+    }
+
+    @Override
+    protected void afterPosted(boolean cancelled) {
+        if (cancelled) {
+            return;
+        }
+
+        boolean inserted = false;
+        if (this.items.size() > 0) {
+            this.items.forEach(item -> ItemHandlerUtils.giveItemToPlayer(this.player, item, -1));
+            inserted = true;
+        }
+
+        if (this.armorItems.size() > 0) {
+            this.armorItems.forEach((key, value) -> {
+                this.player.setItemSlot(key, value);
+
+                // If it didn't place, put it in their inventory
+                if (this.player.getItemBySlot(key).getItem() != value.getItem()) {
+                    ItemHandlerUtils.giveItemToPlayer(this.player, value, -1);
+                }
+            });
+
+            inserted = true;
+        }
+
+        if (inserted) {
+            this.player.kjs$getPersistentData().putBoolean(STARTER_ITEMS_GIVEN_FLAG, true);
+        }
+    }
+
+    @Override
+    public Player getEntity() {
+        return this.player;
+    }
+}

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/modules/Fluids.java renamed to src/main/java/pro/mikey/kubeutils/kubejs/modules/FluidsKu.java

@@ -1,6 +1,5 @@
 package pro.mikey.kubeutils.kubejs.modules;
 
-import dev.latvian.mods.kubejs.util.ListJS;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.registries.ForgeRegistries;
 
@@ -10,8 +9,8 @@
 /**
  * Fluid helpers module
  */
-public class Fluids {
-    public Fluids() {
+public class FluidsKu {
+    public FluidsKu() {
     }
 
     /**
@@ -33,7 +32,7 @@ public List<Fluid> getFluidsByNamespace(@Nullable String namespace) {
     }
 
     /**
-     * Same as {@link Fluids#getFluidsByNamespace(String)} but accepts a list of namespaces
+     * Same as {@link FluidsKu#getFluidsByNamespace(String)} but accepts a list of namespaces
      *
      * @param namespaces the namespaces you want to fetch the fluids for
      *

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/modules/LevelUtils.java renamed to src/main/java/pro/mikey/kubeutils/kubejs/modules/LevelKu.java

@@ -22,11 +22,11 @@
 import java.util.*;
 import java.util.function.Predicate;
 
-public class LevelUtils {
+public class LevelKu {
     private static final ResourceLocation UNKNOWN = new ResourceLocation(KubeUtils.getId(), "unknown");
     private final ServerLevel level;
 
-    public LevelUtils(ServerLevel level) {
+    public LevelKu(ServerLevel level) {
         this.level = level.getLevel();
     }
 

Diff for: src/main/java/pro/mikey/kubeutils/kubejs/modules/ListActions.java renamed to src/main/java/pro/mikey/kubeutils/kubejs/modules/ListsKu.java

@@ -5,13 +5,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
 import java.util.Map;
 
-public class ListActions {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ListActions.class);
+public class ListsKu {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ListsKu.class);
 
-    public ListActions() {
+    public ListsKu() {
     }
 
     /**