npc selections glow again

samolego · Feb 8, 2024 · cc5c8c8 · cc5c8c8
1 parent faafb65
commit cc5c8c8
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 135 deletions.
diff --git a/.github/workflows/fabric-build.yml b/.github/workflows/fabric-build.yml
@@ -37,10 +37,10 @@ jobs:
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew fabric:build
+        run: ./gradlew build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: fabric/build/libs/
+          path: build/libs/
diff --git a/.github/workflows/fabric-release.yml b/.github/workflows/fabric-release.yml
@@ -32,16 +32,16 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build with Gradle
-        run: ./gradlew fabric:build --stacktrace
+        run: ./gradlew :build --stacktrace
 
       - name: Upload GitHub release
         uses: AButler/upload-release-assets@v2.0
         with:
-          files: 'fabric/build/libs/*.jar'
+          files: 'build/libs/*.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish with Gradle
-        run: ./gradlew fabric:modrinth fabric:curseforge --stacktrace
+        run: ./gradlew modrinth curseforge --stacktrace
         env:
           CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

diff --git a/.github/workflows/forge-build.yml b/.github/workflows/forge-build.yml
diff --git a/.github/workflows/forge-release.yml b/.github/workflows/forge-release.yml
diff --git a/build.gradle b/build.gradle
@@ -45,12 +45,13 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    // Dependencies
+    // Mod Dependencies
+
     // Carpet Mod
     modCompileOnly("com.github.gnembon:fabric-carpet:${project.carpet_core_version}")
     // Disguiselib
     //modCompileOnly("xyz.nucleoid:disguiselib-fabric:${project.disguiselib_version}")
-    //modCompileOnly 'com.github.NucleoidMC:DisguiseLib:1.20.4-SNAPSHOT'
+    //modImplementation(include('com.github.NucleoidMC:DisguiseLib:90bf223196'))
 
     // Permission API
     modImplementation(include('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))

diff --git a/src/main/java/org/samo_lego/taterzens/common/Taterzens.java b/src/main/java/org/samo_lego/taterzens/common/Taterzens.java
@@ -87,7 +87,6 @@ public Taterzens(Platform platform) {
         LanguageUtil.setupLanguage();
 
         PolymerEntityUtils.registerType(TATERZEN_TYPE.get());
-
     }
 
     /**

diff --git a/src/main/java/org/samo_lego/taterzens/common/commands/PresetCommand.java b/src/main/java/org/samo_lego/taterzens/common/commands/PresetCommand.java
@@ -60,7 +60,7 @@ private static int loadTaterzenFromPreset(CommandContext<CommandSourceStack> con
 
                 ((ITaterzenEditor) source.getPlayerOrException()).selectNpc(taterzenNPC);
 
-                taterzenNPC.sendProfileUpdates();
+                taterzenNPC.broadcastProfileUpdates();
 
                 source.sendSuccess(() ->
                                 successText("taterzens.command.preset.import.success", filename),

diff --git a/src/main/java/org/samo_lego/taterzens/common/commands/edit/MountCommand.java b/src/main/java/org/samo_lego/taterzens/common/commands/edit/MountCommand.java
@@ -48,7 +48,7 @@ public static int mountTaterzen(CommandContext<CommandSourceStack> context) thro
                 taterzen.startRiding(finalToMount, true);
                 feedbackText = successText("taterzens.command.mount", taterzen.getName().getString(), finalToMount.getName().getString());
             }
-            taterzen.sendProfileUpdates();
+            taterzen.broadcastProfileUpdates();
             src.sendSuccess(() -> feedbackText, false);
         });
     }

diff --git a/src/main/java/org/samo_lego/taterzens/common/commands/edit/SkinCommand.java b/src/main/java/org/samo_lego/taterzens/common/commands/edit/SkinCommand.java
@@ -120,7 +120,7 @@ private static int setCustomSkin(CommandContext<CommandSourceStack> context) thr
                                 skinTag.putString("signature", signature);
 
                                 taterzen.setSkinFromTag(skinTag);
-                                taterzen.sendProfileUpdates();
+                                taterzen.broadcastProfileUpdates();
 
 
                                 context.getSource().sendSuccess(() ->
@@ -147,7 +147,7 @@ private static int copySkinLayers(CommandContext<CommandSourceStack> context) th
             Byte skinLayers = player.getEntityData().get(getPLAYER_MODE_CUSTOMISATION());
             taterzen.setSkinLayers(skinLayers);
 
-            taterzen.sendProfileUpdates();
+            taterzen.broadcastProfileUpdates();
             source.sendSuccess(() ->
                             successText("taterzens.command.skin.mirrored", taterzen.getName().getString()),
                     false

diff --git a/...va/org/samo_lego/taterzens/common/mixin/player/ServerPlayerMixinCast_ITaterzenEditor.java b/...va/org/samo_lego/taterzens/common/mixin/player/ServerPlayerMixinCast_ITaterzenEditor.java
@@ -137,11 +137,11 @@ public boolean selectNpc(@Nullable TaterzenNPC npc) {
         this.selectedNpc = npc;
 
         if (npc != null) {
-            npc.sendProfileUpdates();
+            npc.broadcastProfileUpdates();
         }
 
         if (selectedNpc != null) {
-            selectedNpc.sendProfileUpdates();
+            selectedNpc.broadcastProfileUpdates();
         }
 
         return true;

diff --git a/src/main/java/org/samo_lego/taterzens/common/npc/TaterzenNPC.java b/src/main/java/org/samo_lego/taterzens/common/npc/TaterzenNPC.java
@@ -1,6 +1,5 @@
 package org.samo_lego.taterzens.common.npc;
 
-import com.google.common.collect.Lists;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
@@ -578,14 +577,14 @@ public void setCustomName(Component name) {
         this.gameProfile = new GameProfile(this.getUUID(), profileName);
         if (skin != null) {
             this.setSkinFromTag(skin);
-            this.sendProfileUpdates();
+            this.broadcastProfileUpdates();
         }
     }
 
     /**
      * Updates Taterzen's {@link GameProfile} for others.
      */
-    public void sendProfileUpdates() {
+    public void broadcastProfileUpdates() {
         if (this.level().isClientSide()) return;
 
         ServerChunkCache manager = (ServerChunkCache) this.level().getChunkSource();
@@ -610,7 +609,7 @@ public void applySkin(GameProfile texturesProfile) {
         setSkinFromTag(writeSkinToTag(texturesProfile));
 
         // Sending updates
-        this.sendProfileUpdates();
+        this.broadcastProfileUpdates();
     }
 
     /**
@@ -726,7 +725,7 @@ public void readAdditionalSaveData(CompoundTag tag) {
 
         ListTag pathTargets = (ListTag) npcTag.get("PathTargets");
         if (pathTargets != null) {
-            if (pathTargets.size() > 0) {
+            if (!pathTargets.isEmpty()) {
                 pathTargets.forEach(posTag -> {
                     if (posTag instanceof CompoundTag pos) {
                         BlockPos target = new BlockPos(pos.getInt("x"), pos.getInt("y"), pos.getInt("z"));
@@ -739,7 +738,7 @@ public void readAdditionalSaveData(CompoundTag tag) {
         this.npcData.currentMoveTarget = npcTag.getInt("CurrentMoveTarget");
 
         ListTag messages = (ListTag) npcTag.get("Messages");
-        if (messages != null && messages.size() > 0) {
+        if (messages != null && !messages.isEmpty()) {
             messages.forEach(msgTag -> {
                 CompoundTag msgCompound = (CompoundTag) msgTag;
                 this.addMessage(TextUtil.fromNbtElement(msgCompound.get("Message")), msgCompound.getInt("Delay"));
@@ -768,7 +767,7 @@ public void readAdditionalSaveData(CompoundTag tag) {
 
         // Profession initialising
         ListTag professions = (ListTag) npcTag.get("Professions");
-        if (professions != null && professions.size() > 0) {
+        if (professions != null && !professions.isEmpty()) {
             professions.forEach(professionTag -> {
                 CompoundTag professionCompound = (CompoundTag) professionTag;
 
@@ -1884,17 +1883,17 @@ public EntityType<?> getPolymerEntityType(ServerPlayer player) {
     @Override
     public void modifyRawTrackedData(List<SynchedEntityData.DataValue<?>> data, ServerPlayer player, boolean initial) {
         // Change game profile + skin layers
-    }
-
-    @Override
-    public List<Pair<EquipmentSlot, ItemStack>> getPolymerVisibleEquipment(List<Pair<EquipmentSlot, ItemStack>> items, ServerPlayer player) {
-        List<Pair<EquipmentSlot, ItemStack>> list = Lists.newArrayListWithCapacity(EquipmentSlot.values().length);
-
-        for (var slot : EquipmentSlot.values()) {
-            list.add(Pair.of(slot, this.getItemBySlot(slot)));
-        }
-
-        return list;
+        ((ITaterzenEditor) player).getSelectedNpc().ifPresent(npc -> {
+            if (this == npc && config.glowSelectedNpc) {
+                data.removeIf(value -> value.id() == 7);
+                // Modify Taterzen to have fake glowing effect for the player
+                var flags = this.entityData.get(Entity.DATA_SHARED_FLAGS_ID);
+                flags = (byte) (flags | 1 << Entity.FLAG_GLOWING);
+
+                SynchedEntityData.DataValue<Byte> glowingTag = SynchedEntityData.DataValue.create(Entity.DATA_SHARED_FLAGS_ID, flags);
+                data.add(glowingTag);
+            }
+        });
     }
 
     @Override

diff --git a/src/main/java/org/samo_lego/taterzens/common/platform/Platform.java b/src/main/java/org/samo_lego/taterzens/common/platform/Platform.java
@@ -10,26 +10,26 @@
 /**
  * Base class for platform implementations.
  */
-public abstract class Platform {
+public interface Platform {
 
     /**
      * Gets the path to the directory where the config files are stored.
      * @return the path to the directory where the config files are stored.
      */
-    public abstract Path getConfigDirPath();
+    Path getConfigDirPath();
 
     /**
      * Checks whether certain mod is loaded.
      * @param modId the mod id.
      * @return true if the mod is loaded, false otherwise.
      */
-    public abstract boolean isModLoaded(String modId);
+    boolean isModLoaded(String modId);
 
     /**
      * Gets size of item registry.
      * @return size of item registry.
      */
-    public abstract int getItemRegistrySize();
+    int getItemRegistrySize();
 
     /**
      * Checks for permission of provided command source.
@@ -38,18 +38,17 @@ public abstract class Platform {
      * @param fallbackLevel the fallback level to use if the permission node is not set.
      * @return true if the command source has the permission node, false otherwise.
      */
-    public abstract boolean checkPermission(CommandSourceStack source, String permissionNode, int fallbackLevel);
+    boolean checkPermission(CommandSourceStack source, String permissionNode, int fallbackLevel);
 
     /**
      * Registers the taterzen entity type.
      */
-    public abstract void registerTaterzenType();
+    void registerTaterzenType();
 
-    public void openEditorGui(ServerPlayer player) {
-    }
+    void openEditorGui(ServerPlayer player);
 
 
-    public abstract void disguiseAs(TaterzenNPC taterzen, Entity entity);
+    void disguiseAs(TaterzenNPC taterzen, Entity entity);
 
-    public abstract void clearDisguise(TaterzenNPC taterzen);
+    void clearDisguise(TaterzenNPC taterzen);
 }
diff --git a/src/main/java/org/samo_lego/taterzens/fabric/gui/EditorGUI.java b/src/main/java/org/samo_lego/taterzens/fabric/gui/EditorGUI.java
@@ -42,7 +42,7 @@ public static SimpleGui createCommandGui(ServerPlayer player, @Nullable SimpleGu
             CommandNode<CommandSourceStack> childNode = (CommandNode<CommandSourceStack>) parentNode.getChildren().toArray()[0];
             if (childNode instanceof ArgumentCommandNode) {
                 givenInput = false;
-            } else if (childNode.getChildren().size() > 0) {
+            } else if (!childNode.getChildren().isEmpty()) {
                 currentCommandPath.add(parentNode.getName());
             } else {
                 break;

diff --git a/src/main/java/org/samo_lego/taterzens/fabric/platform/FabricPlatform.java b/src/main/java/org/samo_lego/taterzens/fabric/platform/FabricPlatform.java
@@ -24,7 +24,7 @@
 import static org.samo_lego.taterzens.common.commands.NpcCommand.npcNode;
 import static org.samo_lego.taterzens.fabric.gui.EditorGUI.createCommandGui;
 
-public class FabricPlatform extends Platform {
+public class FabricPlatform implements Platform {
 
     private static final int REGISTRY_ITEMS_SIZE = ((AMappedRegistry<?>) BuiltInRegistries.ITEM).getById().size();