Reorganize some code, just because

Signed-off-by: Paul Schifferer <[email protected]>
sweetrpg · Jan 1, 2024 · ca3222a · ca3222a
1 parent 58851a1
commit ca3222a
Show file tree

Hide file tree

Showing 18 changed files with 112 additions and 225 deletions.
diff --git a/src/main/java/com/sweetrpg/catherder/CatHerder.java b/src/main/java/com/sweetrpg/catherder/CatHerder.java
@@ -4,7 +4,7 @@
 import com.sweetrpg.catherder.client.ClientSetup;
 import com.sweetrpg.catherder.client.entity.render.world.BedFinderRenderer;
 import com.sweetrpg.catherder.client.event.ClientEventHandler;
-import com.sweetrpg.catherder.common.Capabilities;
+import com.sweetrpg.catherder.common.lib.Capabilities;
 import com.sweetrpg.catherder.common.CommonSetup;
 import com.sweetrpg.catherder.common.addon.AddonManager;
 import com.sweetrpg.catherder.common.command.CatRespawnCommand;

diff --git a/src/main/java/com/sweetrpg/catherder/common/CommonSetup.java b/src/main/java/com/sweetrpg/catherder/common/CommonSetup.java
@@ -1,17 +1,14 @@
 package com.sweetrpg.catherder.common;
 
 import com.sweetrpg.catherder.api.feature.FoodHandler;
-import com.sweetrpg.catherder.api.feature.InteractHandler;
 import com.sweetrpg.catherder.common.command.CatRespawnCommand;
 import com.sweetrpg.catherder.common.config.ConfigHandler;
 import com.sweetrpg.catherder.common.entity.CatEntity;
-import com.sweetrpg.catherder.common.entity.FishFoodHandler;
-import com.sweetrpg.catherder.common.entity.HelmetInteractHandler;
-import com.sweetrpg.catherder.common.entity.MeatFoodHandler;
+import com.sweetrpg.catherder.common.event.FishFoodHandler;
 import com.sweetrpg.catherder.common.network.PacketHandler;
 import com.sweetrpg.catherder.common.registry.ModItems;
 import com.sweetrpg.catherder.common.talent.HappyEaterTalent;
-import com.sweetrpg.catherder.common.world.WildCropGeneration;
+import com.sweetrpg.catherder.common.world.gen.WildCropGeneration;
 import net.minecraft.world.level.block.ComposterBlock;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 
@@ -25,7 +22,7 @@ public static void init(final FMLCommonSetupEvent event) {
             FoodHandler.registerHandler(new FishFoodHandler());
             FoodHandler.registerDynPredicate(HappyEaterTalent.INNER_DYN_PRED);
 
-            InteractHandler.registerHandler(new HelmetInteractHandler());
+//            InteractHandler.registerHandler(new HelmetInteractHandler());
             ConfigHandler.initTalentConfig();
             CatRespawnCommand.registerSerilizers();
             CatEntity.initDataParameters();

diff --git a/src/main/java/com/sweetrpg/catherder/common/entity/CatEntity.java b/src/main/java/com/sweetrpg/catherder/common/entity/CatEntity.java
@@ -17,7 +17,7 @@
 import com.sweetrpg.catherder.common.entity.ai.CatLieOnBedGoal;
 import com.sweetrpg.catherder.common.entity.ai.CatSitOnBlockGoal;
 import com.sweetrpg.catherder.common.entity.ai.*;
-import com.sweetrpg.catherder.common.entity.serializers.DimensionDependantArg;
+import com.sweetrpg.catherder.common.entity.misc.DimensionDependentArg;
 import com.sweetrpg.catherder.common.entity.stats.StatsTracker;
 import com.sweetrpg.catherder.common.lib.Constants;
 import com.sweetrpg.catherder.common.registry.*;
@@ -27,7 +27,6 @@
 import com.sweetrpg.catherder.common.util.NBTUtil;
 import com.sweetrpg.catherder.common.util.Util;
 import com.sweetrpg.catherder.common.util.WorldUtil;
-import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -45,7 +44,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.OldUsersConverter;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
@@ -126,9 +124,9 @@ public class CatEntity extends AbstractCatEntity {
     private static final Cache<EntityDataAccessor<CatLevel>> CAT_LEVEL = Cache.make(() -> (EntityDataAccessor<CatLevel>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_LEVEL_SERIALIZER.get().getSerializer()));
     private static final Cache<EntityDataAccessor<EnumGender>> GENDER = Cache.make(() -> (EntityDataAccessor<EnumGender>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.GENDER_SERIALIZER.get().getSerializer()));
     private static final Cache<EntityDataAccessor<EnumMode>> MODE = Cache.make(() -> (EntityDataAccessor<EnumMode>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.MODE_SERIALIZER.get().getSerializer()));
-    private static final Cache<EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>> CAT_TREE_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
-    private static final Cache<EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>> CAT_BOWL_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
-    private static final Cache<EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>> LITTERBOX_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependantArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
+    private static final Cache<EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>> CAT_TREE_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
+    private static final Cache<EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>> CAT_BOWL_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
+    private static final Cache<EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>> LITTERBOX_LOCATION = Cache.make(() -> (EntityDataAccessor<DimensionDependentArg<Optional<BlockPos>>>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.CAT_TREE_LOC_SERIALIZER.get().getSerializer()));
     private static final Cache<EntityDataAccessor<Integer>> ORIGINAL_BREED = Cache.make(() -> (EntityDataAccessor<Integer>) SynchedEntityData.defineId(CatEntity.class, ModSerializers.ORIGINAL_BREED_SERIALIZER.get().getSerializer()));
 
     public final Map<Integer, Object> objects = new HashMap<>();
@@ -198,9 +196,9 @@ protected void defineSynchedData() {
         this.entityData.define(SIZE, (byte) 3);
         this.entityData.define(ORIGINAL_BREED_INT, 0);
         this.entityData.define(TOY_VARIANT, ItemStack.EMPTY);
-        this.entityData.define(CAT_TREE_LOCATION.get(), new DimensionDependantArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
-        this.entityData.define(CAT_BOWL_LOCATION.get(), new DimensionDependantArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
-        this.entityData.define(LITTERBOX_LOCATION.get(), new DimensionDependantArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
+        this.entityData.define(CAT_TREE_LOCATION.get(), new DimensionDependentArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
+        this.entityData.define(CAT_BOWL_LOCATION.get(), new DimensionDependentArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
+        this.entityData.define(LITTERBOX_LOCATION.get(), new DimensionDependentArg<>(() -> EntityDataSerializers.OPTIONAL_BLOCK_POS));
 //        this.entityData.define(IS_LYING, false);
         this.entityData.define(RELAX_STATE_ONE, false);
     }
@@ -1309,7 +1307,7 @@ public void addAdditionalSaveData(CompoundTag compound) {
         compound.putInt("original_breed", this.getOriginalBreed());
         NBTUtil.writeItemStack(compound, "fetchItem", this.getToyVariant());
 
-        DimensionDependantArg<Optional<BlockPos>> bedsData = this.entityData.get(CAT_TREE_LOCATION.get());
+        DimensionDependentArg<Optional<BlockPos>> bedsData = this.entityData.get(CAT_TREE_LOCATION.get());
 
         if(!bedsData.isEmpty()) {
             ListTag bedsList = new ListTag();
@@ -1324,7 +1322,7 @@ public void addAdditionalSaveData(CompoundTag compound) {
             compound.put("beds", bedsList);
         }
 
-        DimensionDependantArg<Optional<BlockPos>> bowlsData = this.entityData.get(CAT_BOWL_LOCATION.get());
+        DimensionDependentArg<Optional<BlockPos>> bowlsData = this.entityData.get(CAT_BOWL_LOCATION.get());
 
         if(!bowlsData.isEmpty()) {
             ListTag bowlsList = new ListTag();
@@ -1555,7 +1553,7 @@ public void readAdditionalSaveData(CompoundTag compound) {
         }
 
         // cat tree
-        DimensionDependantArg<Optional<BlockPos>> bedsData = this.entityData.get(CAT_TREE_LOCATION.get()).copyEmpty();
+        DimensionDependentArg<Optional<BlockPos>> bedsData = this.entityData.get(CAT_TREE_LOCATION.get()).copyEmpty();
 
         try {
             if(compound.contains("beds", Tag.TAG_LIST)) {
@@ -1578,7 +1576,7 @@ public void readAdditionalSaveData(CompoundTag compound) {
         this.entityData.set(CAT_TREE_LOCATION.get(), bedsData);
 
         // cat bowl
-        DimensionDependantArg<Optional<BlockPos>> bowlsData = this.entityData.get(CAT_BOWL_LOCATION.get()).copyEmpty();
+        DimensionDependentArg<Optional<BlockPos>> bowlsData = this.entityData.get(CAT_BOWL_LOCATION.get()).copyEmpty();
 
         try {
             if(compound.contains("bowls", Tag.TAG_LIST)) {
@@ -1601,7 +1599,7 @@ public void readAdditionalSaveData(CompoundTag compound) {
         this.entityData.set(CAT_BOWL_LOCATION.get(), bowlsData);
 
         // litterbox
-        DimensionDependantArg<Optional<BlockPos>> litterboxData = this.entityData.get(LITTERBOX_LOCATION.get()).copyEmpty();
+        DimensionDependentArg<Optional<BlockPos>> litterboxData = this.entityData.get(LITTERBOX_LOCATION.get()).copyEmpty();
 
         try {
             if(compound.contains("litterbox", Tag.TAG_LIST)) {

diff --git a/src/main/java/com/sweetrpg/catherder/common/entity/HelmetInteractHandler.java b/src/main/java/com/sweetrpg/catherder/common/entity/HelmetInteractHandler.java
diff --git a/src/main/java/com/sweetrpg/catherder/common/entity/accessory/Helmet.java b/src/main/java/com/sweetrpg/catherder/common/entity/accessory/Helmet.java
diff --git a/src/main/java/com/sweetrpg/catherder/common/entity/accessory/LeatherArmourAccessory.java b/src/main/java/com/sweetrpg/catherder/common/entity/accessory/LeatherArmourAccessory.java
diff --git a/src/main/java/com/sweetrpg/catherder/common/entity/accessory/LeatherHelmet.java b/src/main/java/com/sweetrpg/catherder/common/entity/accessory/LeatherHelmet.java
diff --git a/...ty/serializers/DimensionDependantArg.java → ...on/entity/misc/DimensionDependentArg.java b/...ty/serializers/DimensionDependantArg.java → ...on/entity/misc/DimensionDependentArg.java
@@ -1,4 +1,4 @@
-package com.sweetrpg.catherder.common.entity.serializers;
+package com.sweetrpg.catherder.common.entity.misc;
 
 import net.minecraft.network.syncher.EntityDataSerializer;
 import net.minecraft.resources.ResourceKey;
@@ -7,13 +7,13 @@
 import java.util.*;
 import java.util.function.Supplier;
 
-public class DimensionDependantArg<T> implements Map<ResourceKey<Level>, T> {
+public class DimensionDependentArg<T> implements Map<ResourceKey<Level>, T> {
 
     private Supplier<EntityDataSerializer<T>> serializer;
 
     public Map<ResourceKey<Level>, T> map = new HashMap<>();
 
-    public DimensionDependantArg(Supplier<EntityDataSerializer<T>> serializer) {
+    public DimensionDependentArg(Supplier<EntityDataSerializer<T>> serializer) {
         this.serializer = serializer;
     }
 
@@ -36,17 +36,17 @@ public EntityDataSerializer<T> getSerializer() {
         return this.serializer.get();
     }
 
-    public DimensionDependantArg<T> copy() {
-        DimensionDependantArg<T> clone = new DimensionDependantArg<>(this.serializer);
+    public DimensionDependentArg<T> copy() {
+        DimensionDependentArg<T> clone = new DimensionDependentArg<>(this.serializer);
         clone.map.putAll(this.map);
         return clone;
     }
 
-    public DimensionDependantArg<T> copyEmpty() {
-        return new DimensionDependantArg<>(this.serializer);
+    public DimensionDependentArg<T> copyEmpty() {
+        return new DimensionDependentArg<>(this.serializer);
     }
 
-    public DimensionDependantArg<T> set(ResourceKey<Level> dim, T value) {
+    public DimensionDependentArg<T> set(ResourceKey<Level> dim, T value) {
         this.put(dim, value);
         return this;
     }
@@ -65,10 +65,10 @@ public String toString() {
     public boolean equals(Object obj) {
         if (obj.getClass() != this.getClass()) {
             return false;
-        } else if (!(obj instanceof DimensionDependantArg)) {
+        } else if (!(obj instanceof DimensionDependentArg)) {
             return false;
         } else {
-            DimensionDependantArg<?> other = (DimensionDependantArg<?>) obj;
+            DimensionDependentArg<?> other = (DimensionDependentArg<?>) obj;
             return this.map.equals(other.map);
         }
     }