Persist default skin for robit regardless of holiday if the default skin was manually set (#8138)

Author: pupnewfster

src/main/java/mekanism/common/entity/EntityRobit.java

@@ -147,6 +147,8 @@ private static <T> EntityDataAccessor<T> define(EntityDataSerializer<T> dataSeri
     private static final EntityDataAccessor<SecurityMode> SECURITY = define(MekanismDataSerializers.SECURITY.value());
     private static final EntityDataAccessor<Boolean> FOLLOW = define(EntityDataSerializers.BOOLEAN);
     private static final EntityDataAccessor<Boolean> DROP_PICKUP = define(EntityDataSerializers.BOOLEAN);
+    //Note: We sync the default skin part, so that pick item on the robit will properly persist this
+    private static final EntityDataAccessor<Boolean> DEFAULT_SKIN_MANUALLY_SELECTED = define(EntityDataSerializers.BOOLEAN);
     private static final EntityDataAccessor<ResourceKey<RobitSkin>> SKIN = define(MekanismDataSerializers.ROBIT_SKIN.value());
 
     private static final List<RecipeError> TRACKED_ERROR_TYPES = List.of(
@@ -277,6 +279,7 @@ protected void defineSynchedData(@NotNull SynchedEntityData.Builder builder) {
         builder.define(SECURITY, SecurityMode.PUBLIC);
         builder.define(FOLLOW, false);
         builder.define(DROP_PICKUP, false);
+        builder.define(DEFAULT_SKIN_MANUALLY_SELECTED, false);
         builder.define(SKIN, MekanismRobitSkins.BASE);
     }
 
@@ -347,7 +350,7 @@ public void baseTick() {
             energySlot.fillContainerOrConvert();
             recipeCacheLookupMonitor.updateAndProcess();
 
-            if (HolidayManager.hasRobitSkinsToday() && getSkin() == MekanismRobitSkins.BASE) {
+            if (!isDefaultSkinManuallySelected() && HolidayManager.hasRobitSkinsToday() && getSkin() == MekanismRobitSkins.BASE) {
                 //Randomize the robit's skin
                 setSkin(HolidayManager.getRandomBaseSkin(level().random), null);
             }
@@ -459,6 +462,7 @@ private ItemStack getItemVariant() {
             security.setOwnerUUID(getOwnerUUID());
             security.setSecurityMode(getSecurityMode());
         }
+        stack.set(MekanismDataComponents.DEFAULT_MANUALLY_SELECTED, isDefaultSkinManuallySelected());
         stack.set(MekanismDataComponents.ROBIT_SKIN, getSkin());
         return stack;
     }
@@ -668,7 +672,7 @@ public IEnergyContainer getEnergyContainer() {
     }
 
     @Override
-    public ItemStack getPickedResult(HitResult target) {
+    public ItemStack getPickedResult(@NotNull HitResult target) {
         return getItemVariant();
     }
 
@@ -729,6 +733,14 @@ public <T> Optional<T> evaluate(@NotNull BiFunction<Level, BlockPos, T> worldBlo
         };
     }
 
+    public boolean isDefaultSkinManuallySelected() {
+        return entityData.get(DEFAULT_SKIN_MANUALLY_SELECTED);
+    }
+
+    public void setDefaultSkinManuallySelected(boolean value) {
+        entityData.set(DEFAULT_SKIN_MANUALLY_SELECTED, value);
+    }
+
     @NotNull
     @Override
     public ResourceKey<RobitSkin> getSkin() {
@@ -759,6 +771,9 @@ public boolean setSkin(@NotNull ResourceKey<RobitSkin> skinKey, @Nullable Player
             }
         }
         entityData.set(SKIN, skinKey);
+        if (skinKey == MekanismRobitSkins.BASE) {
+            setDefaultSkinManuallySelected(true);
+        }
         return true;
     }
 

src/main/java/mekanism/common/item/ItemRobit.java

@@ -50,6 +50,7 @@ public ItemRobit(Properties properties) {
         super(properties.rarity(Rarity.RARE).stacksTo(1)
               .component(MekanismDataComponents.ROBIT_SKIN, MekanismRobitSkins.BASE)
               .component(MekanismDataComponents.SECURITY, SecurityMode.PUBLIC)
+              .component(MekanismDataComponents.DEFAULT_MANUALLY_SELECTED, false)
         );
     }
 
@@ -111,6 +112,7 @@ public InteractionResult useOn(UseOnContext context) {
                     robit.setSecurityMode(securityObject.getSecurityMode());
                 }
                 robit.setSkin(stack.getOrDefault(MekanismDataComponents.ROBIT_SKIN, MekanismRobitSkins.BASE), player);
+                robit.setDefaultSkinManuallySelected(stack.getOrDefault(MekanismDataComponents.DEFAULT_MANUALLY_SELECTED, false));
                 world.addFreshEntity(robit);
                 world.gameEvent(player, GameEvent.ENTITY_PLACE, robit.blockPosition());
                 stack.shrink(1);
@@ -130,7 +132,7 @@ public void attachCapabilities(RegisterCapabilitiesEvent event) {
     @Override
     public void inventoryTick(@NotNull ItemStack stack, @NotNull Level level, @NotNull Entity entity, int slot, boolean isSelected) {
         super.inventoryTick(stack, level, entity, slot, isSelected);
-        if (!level.isClientSide && HolidayManager.hasRobitSkinsToday()) {
+        if (!level.isClientSide && HolidayManager.hasRobitSkinsToday() && !stack.getOrDefault(MekanismDataComponents.DEFAULT_MANUALLY_SELECTED, false)) {
             ResourceKey<RobitSkin> skin = stack.get(MekanismDataComponents.ROBIT_SKIN);
             if (skin == null || skin == MekanismRobitSkins.BASE) {
                 //Randomize the robit's skin

src/main/java/mekanism/common/registries/MekanismDataComponents.java

@@ -153,6 +153,7 @@ private MekanismDataComponents() {
                 .networkSynchronized(RedstoneOutput.STREAM_CODEC)
     );
 
+    public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> DEFAULT_MANUALLY_SELECTED = DATA_COMPONENTS.registerBoolean("default_manually_selected");
     public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> SCUBA_TANK_MODE = DATA_COMPONENTS.registerBoolean("scuba_tank_mode");
     public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> ELECTRIC_BOW_MODE = DATA_COMPONENTS.registerBoolean("electric_bow_mode");
     public static final MekanismDeferredHolder<DataComponentType<?>, DataComponentType<Boolean>> BUCKET_MODE = DATA_COMPONENTS.registerBoolean("bucket_mode");