localizations

KessokuTeaTime · Mar 10, 2024 · 13b4f9c · 13b4f9c
1 parent 7d919e5
commit 13b4f9c
Show file tree

Hide file tree

Showing 16 changed files with 205 additions and 171 deletions.
diff --git a/src/main/java/net/krlite/knowledges/KnowledgesClient.java b/src/main/java/net/krlite/knowledges/KnowledgesClient.java
@@ -24,7 +24,6 @@
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -162,6 +161,7 @@ public void onInitializeClient() {
                     .forEach(tag -> TAGS.register(namespace, tag));
         });
 
+        if (CONFIG.global.autoTidiesUp) tidyUpConfig();
         CONFIG_HOLDER.save();
 
         if (!COMPONENTS.asMap().isEmpty()) {
@@ -193,7 +193,7 @@ public void onInitializeClient() {
         }));
     }
 
-    public static void tidyUp() {
+    public static void tidyUpConfig() {
         COMPONENTS.tidyUp();
         DATA.tidyUp();
         TAGS.tidyUp();

diff --git a/src/main/java/net/krlite/knowledges/api/core/path/WithPartialPath.java b/src/main/java/net/krlite/knowledges/api/core/path/WithPartialPath.java
@@ -9,6 +9,6 @@ public interface WithPartialPath extends WithPath {
 
     @Override
     default @NotNull String path() {
-        return currentPath() + "." + partialPath();
+        return currentPath() + "/" + partialPath();
     }
 }
diff --git a/src/main/java/net/krlite/knowledges/api/tag/AdditionalTag.java b/src/main/java/net/krlite/knowledges/api/tag/AdditionalTag.java
@@ -5,7 +5,7 @@
 import net.minecraft.nbt.NbtCompound;
 
 public interface AdditionalTag<R extends Representable<?>, T> extends WithPath {
-    boolean shouldApply(T t);
+    boolean isApplicableTo(T t);
 
     Class<R> targetRepresentableClass();
 

diff --git a/src/main/java/net/krlite/knowledges/config/modmenu/KnowledgesConfigScreen.java b/src/main/java/net/krlite/knowledges/config/modmenu/KnowledgesConfigScreen.java
@@ -84,7 +84,7 @@ public void register(Object object, BooleanListEntry entry) {
             .setShouldTabsSmoothScroll(true)
             .setShouldListSmoothScroll(true)
             .setSavingRunnable(() -> {
-                if (KnowledgesClient.CONFIG.global.autoTidiesUp) KnowledgesClient.tidyUp();
+                if (KnowledgesClient.CONFIG.global.autoTidiesUp) KnowledgesClient.tidyUpConfig();
                 KnowledgesClient.CONFIG_HOLDER.save();
             });
     private final ConfigEntryBuilder entryBuilder = configBuilder.entryBuilder();

diff --git a/src/main/java/net/krlite/knowledges/impl/data/info/AbstractBlockInfoComponentData.java b/src/main/java/net/krlite/knowledges/impl/data/info/AbstractBlockInfoComponentData.java
@@ -8,6 +8,6 @@
 public abstract class AbstractBlockInfoComponentData implements Data<BlockInfoComponent>, WithPartialPath {
     @Override
     public @NotNull String currentPath() {
-        return "info.block";
+        return "info/block";
     }
 }
diff --git a/src/main/java/net/krlite/knowledges/impl/data/info/AbstractEntityInfoComponentData.java b/src/main/java/net/krlite/knowledges/impl/data/info/AbstractEntityInfoComponentData.java
@@ -8,6 +8,6 @@
 public abstract class AbstractEntityInfoComponentData implements Data<EntityInfoComponent>, WithPartialPath {
     @Override
     public @NotNull String currentPath() {
-        return "info.entity";
+        return "info/entity";
     }
 }
diff --git a/src/main/java/net/krlite/knowledges/impl/data/info/block/AbstractBlockInformationData.java b/src/main/java/net/krlite/knowledges/impl/data/info/block/AbstractBlockInformationData.java
@@ -7,6 +7,6 @@
 public abstract class AbstractBlockInformationData extends AbstractBlockInfoComponentData implements BlockInfoComponent.BlockInformationInvoker.Protocol {
     @Override
     public @NotNull String currentPath() {
-        return super.currentPath() + ".block_information";
+        return super.currentPath() + "/block_information";
     }
 }
diff --git a/.../krlite/knowledges/impl/data/info/block/blockinformation/BeehiveBlockInformationData.java b/.../krlite/knowledges/impl/data/info/block/blockinformation/BeehiveBlockInformationData.java
@@ -6,7 +6,7 @@
 import net.krlite.knowledges.api.tag.caster.NbtBooleanCaster;
 import net.krlite.knowledges.api.tag.caster.NbtByteCaster;
 import net.krlite.knowledges.impl.data.info.block.AbstractBlockInformationData;
-import net.krlite.knowledges.impl.tag.block.BeehiveAdditionalTag;
+import net.krlite.knowledges.impl.tag.block.BeehiveTag;
 import net.minecraft.block.BeehiveBlock;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BeehiveBlockEntity;
@@ -17,7 +17,6 @@
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Predicate;
 
 public class BeehiveBlockInformationData extends AbstractBlockInformationData {
     @Override
@@ -33,13 +32,13 @@ public Optional<MutableText> blockInformation(BlockRepresentable representable)
                 );
 
                 final AtomicReference<MutableText> beeCountText = new AtomicReference<>(Text.empty());
-                ((NbtByteCaster) BeehiveAdditionalTag.Protocol.BEES_BYTE.caster()).get(data).ifPresent(beeCount -> {
+                ((NbtByteCaster) BeehiveTag.Protocol.BEES_BYTE.caster()).get(data).ifPresent(beeCount -> {
                     beeCountText.set(beeCount == 0 ? localize("bee_count", "empty") : Text.translatable(
                             localizationKey("bee_count"),
                             beeCount
                     ));
                 });
-                ((NbtBooleanCaster) BeehiveAdditionalTag.Protocol.FULL_BOOLEAN.caster()).get(data).ifPresent(full -> {
+                ((NbtBooleanCaster) BeehiveTag.Protocol.FULL_BOOLEAN.caster()).get(data).ifPresent(full -> {
                     if (full) beeCountText.set(localize("bee_count", "full"));
                 });
 

diff --git a/src/main/java/net/krlite/knowledges/impl/data/info/entity/AbstractEntityDescriptionData.java b/src/main/java/net/krlite/knowledges/impl/data/info/entity/AbstractEntityDescriptionData.java
@@ -7,6 +7,6 @@
 public abstract class AbstractEntityDescriptionData extends AbstractEntityInfoComponentData implements EntityInfoComponent.EntityDescriptionInvoker.Protocol {
     @Override
     public @NotNull String currentPath() {
-        return super.currentPath() + ".entity_description";
+        return super.currentPath() + "/entity_description";
     }
 }
diff --git a/src/main/java/net/krlite/knowledges/impl/data/info/entity/AbstractEntityInformationData.java b/src/main/java/net/krlite/knowledges/impl/data/info/entity/AbstractEntityInformationData.java
@@ -7,6 +7,6 @@
 public abstract class AbstractEntityInformationData extends AbstractEntityInfoComponentData implements EntityInfoComponent.EntityInformationInvoker.Protocol {
     @Override
     public @NotNull String currentPath() {
-        return super.currentPath() + ".entity_information";
+        return super.currentPath() + "/entity_information";
     }
 }
diff --git a/src/main/java/net/krlite/knowledges/impl/entrypoint/KnowledgesTagProvider.java b/src/main/java/net/krlite/knowledges/impl/entrypoint/KnowledgesTagProvider.java
@@ -2,7 +2,7 @@
 
 import net.krlite.knowledges.api.entrypoint.TagProvider;
 import net.krlite.knowledges.api.tag.AdditionalTag;
-import net.krlite.knowledges.impl.tag.block.BeehiveAdditionalTag;
+import net.krlite.knowledges.impl.tag.block.BeehiveTag;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -11,7 +11,7 @@ public class KnowledgesTagProvider implements TagProvider {
     @Override
     public @NotNull List<Class<? extends AdditionalTag<?, ?>>> provide() {
         return List.of(
-            BeehiveAdditionalTag.class
+            BeehiveTag.class
         );
     }
 }
diff --git a/.../impl/tag/block/BeehiveAdditionalTag.java → ...knowledges/impl/tag/block/BeehiveTag.java b/.../impl/tag/block/BeehiveAdditionalTag.java → ...knowledges/impl/tag/block/BeehiveTag.java
@@ -14,8 +14,8 @@
 import net.minecraft.nbt.NbtCompound;
 import org.jetbrains.annotations.NotNull;
 
-public class BeehiveAdditionalTag implements AdditionalBlockTag {
-    public enum Protocol implements TagProtocol<BeehiveAdditionalTag, Protocol> {
+public class BeehiveTag implements AdditionalBlockTag {
+    public enum Protocol implements TagProtocol<BeehiveTag, Protocol> {
         BEES_BYTE(new NbtByteCaster("Bees")),
         FULL_BOOLEAN(new NbtBooleanCaster("Full"));
 
@@ -32,7 +32,7 @@ public NbtCaster<?> caster() {
     }
 
     @Override
-    public boolean shouldApply(Block block) {
+    public boolean isApplicableTo(Block block) {
         System.out.println(block);
         return block instanceof BeehiveBlock;
     }

diff --git a/src/main/java/net/krlite/knowledges/impl/tag/entity/AnimalOwnerTag.java b/src/main/java/net/krlite/knowledges/impl/tag/entity/AnimalOwnerTag.java
@@ -0,0 +1,37 @@
+package net.krlite.knowledges.impl.tag.entity;
+
+import net.krlite.knowledges.api.representable.EntityRepresentable;
+import net.krlite.knowledges.api.tag.AdditionalEntityTag;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.Ownable;
+import net.minecraft.entity.passive.TameableEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class AnimalOwnerTag implements AdditionalEntityTag {
+    @Override
+    public boolean isApplicableTo(Entity entity) {
+        return true;
+    }
+
+    @Override
+    public void append(NbtCompound data, EntityRepresentable representable) {
+        MinecraftServer server = representable.world().getServer();
+        Entity entity = representable.entity();
+        if (server != null && server.isHost(representable.player().getGameProfile()) && entity instanceof TameableEntity)
+            return;
+
+        if (entity instanceof Ownable ownable && ownable.getOwner() != null) {
+            UUID owner = ownable.getOwner().getUuid();
+        }
+    }
+
+    @Override
+    public @NotNull String path() {
+        return "animal_owner";
+    }
+}
diff --git a/src/main/java/net/krlite/knowledges/manager/KnowledgesTagManager.java b/src/main/java/net/krlite/knowledges/manager/KnowledgesTagManager.java
@@ -28,13 +28,13 @@ protected String localizationPrefix() {
 
     public List<AdditionalBlockTag> byBlock(Block block) {
         return ofSpecifiedType(AdditionalBlockTag.class).stream()
-                .filter(t -> t.shouldApply(block))
+                .filter(t -> t.isApplicableTo(block))
                 .toList();
     }
 
     public List<AdditionalEntityTag> byEntity(Entity entity) {
         return ofSpecifiedType(AdditionalEntityTag.class).stream()
-                .filter(t -> t.shouldApply(entity))
+                .filter(t -> t.isApplicableTo(entity))
                 .toList();
     }
 }